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

Conflicts: community-testing/clementine/PKGBUILD community-testing/gedit-plugins/PKGBUILD community-testing/giggle/PKGBUILD community-testing/gimmie/PKGBUILD community-testing/glipper/PKGBUILD community-testing/gnome-system-tools/PKGBUILD community-testing/gnote/PKGBUILD community-testing/gnubiff/PKGBUILD community-testing/google-gadgets/PKGBUILD community-testing/gphpedit/PKGBUILD community-testing/ibus/PKGBUILD community-testing/inputattach/PKGBUILD community-testing/liboobs/PKGBUILD community-testing/perl-gtk2-webkit/PKGBUILD community-testing/shotwell/PKGBUILD community-testing/surf/PKGBUILD community-testing/system-tools-backends/PKGBUILD community-testing/uzbl/PKGBUILD community-testing/workrave/PKGBUILD community/cherrypy/PKGBUILD community/llvm/PKGBUILD community/xonotic/PKGBUILD extra/ntfs-3g/PKGBUILD extra/ntfsprogs/PKGBUILD extra/rhino/PKGBUILD testing/accountsservice/PKGBUILD testing/anjuta/PKGBUILD testing/ardour/PKGBUILD testing/at-spi/PKGBUILD testing/at-spi2-atk/PKGBUILD testing/at-spi2-core/PKGBUILD testing/atk/PKGBUILD testing/atkmm/PKGBUILD testing/avahi/PKGBUILD testing/banshee/PKGBUILD testing/brasero/PKGBUILD testing/cairomm/PKGBUILD testing/cheese/PKGBUILD testing/claws-mail-extra-plugins/PKGBUILD testing/clutter-gst/PKGBUILD testing/clutter-gtk/PKGBUILD testing/clutter-gtk2/PKGBUILD testing/clutter/PKGBUILD testing/cups-pk-helper/PKGBUILD testing/dconf/PKGBUILD testing/devhelp/PKGBUILD testing/ekiga/PKGBUILD testing/empathy/PKGBUILD testing/eog-plugins/PKGBUILD testing/eog/PKGBUILD testing/epiphany-extensions/PKGBUILD testing/epiphany/PKGBUILD testing/evince/PKGBUILD testing/evolution-data-server/PKGBUILD testing/evolution-exchange/PKGBUILD testing/evolution/PKGBUILD testing/farsight2/PKGBUILD testing/file-roller/PKGBUILD testing/folks/PKGBUILD testing/gcalctool/PKGBUILD testing/gconf-editor/PKGBUILD testing/gconf/PKGBUILD testing/gdk-pixbuf2/PKGBUILD testing/gdl/PKGBUILD testing/gdm/PKGBUILD testing/gedit/PKGBUILD testing/gimp-devel/PKGBUILD testing/gimp/PKGBUILD testing/gjs/PKGBUILD testing/glade/PKGBUILD testing/glib-networking/PKGBUILD testing/glib2/PKGBUILD testing/glibmm/PKGBUILD testing/gnome-applets/PKGBUILD testing/gnome-bluetooth/PKGBUILD testing/gnome-color-manager/PKGBUILD testing/gnome-control-center/PKGBUILD testing/gnome-desktop/PKGBUILD testing/gnome-disk-utility/PKGBUILD testing/gnome-games/PKGBUILD testing/gnome-keyring/PKGBUILD testing/gnome-media/PKGBUILD testing/gnome-menus/PKGBUILD testing/gnome-nettool/PKGBUILD testing/gnome-panel/PKGBUILD testing/gnome-pilot/PKGBUILD testing/gnome-power-manager/PKGBUILD testing/gnome-screensaver/PKGBUILD testing/gnome-session/PKGBUILD testing/gnome-settings-daemon/PKGBUILD testing/gnome-sharp/PKGBUILD testing/gnome-shell/PKGBUILD testing/gnome-system-monitor/PKGBUILD testing/gnome-terminal/PKGBUILD testing/gnome-themes-standard/PKGBUILD testing/gnome-user-share/PKGBUILD testing/gnome-utils/PKGBUILD testing/gobject-introspection/PKGBUILD testing/gthumb/PKGBUILD testing/gtk-vnc/PKGBUILD testing/gtk2/PKGBUILD testing/gtk3/PKGBUILD testing/gtkhtml4/PKGBUILD testing/gtkmm/PKGBUILD testing/gtkmm3/PKGBUILD testing/gtksourceview3/PKGBUILD testing/gucharmap/PKGBUILD testing/gvfs/PKGBUILD testing/kdeplasma-applets-networkmanagement/PKGBUILD testing/kismet/PKGBUILD testing/lcms2/PKGBUILD testing/libcanberra/PKGBUILD testing/libchamplain/PKGBUILD testing/libdmapsharing/PKGBUILD testing/libgda/PKGBUILD testing/libgdata/PKGBUILD testing/libgnome-keyring/PKGBUILD testing/libgnome-media-profiles/PKGBUILD testing/libgnomekbd/PKGBUILD testing/libgpod/PKGBUILD testing/libgweather/PKGBUILD testing/libimobiledevice/PKGBUILD testing/liblrdf/PKGBUILD testing/libnice/PKGBUILD testing/libnotify/PKGBUILD testing/libpeas/PKGBUILD testing/librsvg/PKGBUILD testing/libsocialweb/PKGBUILD testing/libsoup/PKGBUILD testing/libunique/PKGBUILD testing/libunique3/PKGBUILD testing/libwebkit/PKGBUILD testing/libwnck/PKGBUILD testing/libwnck3/PKGBUILD testing/libxklavier/PKGBUILD testing/liferea/PKGBUILD testing/mail-notification/PKGBUILD testing/metacity/PKGBUILD testing/midori/PKGBUILD testing/miro/PKGBUILD testing/mousetweaks/PKGBUILD testing/mpd/PKGBUILD testing/mutter/PKGBUILD testing/mx/PKGBUILD testing/nautilus-open-terminal/PKGBUILD testing/nautilus-sendto/PKGBUILD testing/nautilus/PKGBUILD testing/network-manager-applet/PKGBUILD testing/networkmanager-openvpn/PKGBUILD testing/networkmanager-pptp/PKGBUILD testing/networkmanager-vpnc/PKGBUILD testing/networkmanager/PKGBUILD testing/notification-daemon/PKGBUILD testing/opal/PKGBUILD testing/pangomm/PKGBUILD testing/pidgin/PKGBUILD testing/polkit-gnome/PKGBUILD testing/polkit/PKGBUILD testing/ptlib/PKGBUILD testing/pygobject/PKGBUILD testing/pygtk/PKGBUILD testing/pywebkitgtk/PKGBUILD testing/raptor/PKGBUILD testing/raptor1/PKGBUILD testing/rasqal/PKGBUILD testing/redland/PKGBUILD testing/rest/PKGBUILD testing/rhythmbox/PKGBUILD testing/seahorse/PKGBUILD testing/slv2/PKGBUILD testing/soprano/PKGBUILD testing/sound-juicer/PKGBUILD testing/telepathy-gabble/PKGBUILD testing/telepathy-glib/PKGBUILD testing/telepathy-logger/PKGBUILD testing/telepathy-mission-control/PKGBUILD testing/tomboy/PKGBUILD testing/totem-plparser/PKGBUILD testing/totem/PKGBUILD testing/udisks/PKGBUILD testing/upower/PKGBUILD testing/vinagre/PKGBUILD testing/vino/PKGBUILD testing/vte/PKGBUILD testing/yelp/PKGBUILD testing/zenity/PKGBUILD
author: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-05-01 21:35:15 -0300
committer: Nicolas Reynolds <fauno@kiwwwi.com.ar> 2011-05-01 21:35:15 -0300
commit: 4a662496845b00e9e85268bda9853ce13d5a4ba1 (patch)
tree: 58f64df09a3fc9eb5e4cb7fbbe600216e591bfb5
parent: 5a1b7efd1dfd0d0a1f4a7a4b68ea7b69f06aa6d1 (diff)
parent: 3be02a9acbeb006d9a9e6136c54d91064cc7d80e (diff)
469 files changed, 0 insertions, 22388 deletions
diff --git a/community-testing/clementine/PKGBUILD b/community-testing/clementine/PKGBUILD
deleted file mode 100644
index 54ef7c949..000000000
--- a/community-testing/clementine/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 44544 2011-04-08 11:52:13Z stephane $
-#Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-#Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
-#Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
-
-pkgname=clementine
-pkgver=0.7.1
-pkgrel=2
-pkgdesc="A music player and library organizer"
-url="http://www.clementine-player.org/"
-license=('GPL')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('gstreamer0.10' 'taglib' 'glew' 'liblastfm' 'libgpod' 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice')
-makedepends=('cmake' 'boost')
-optdepends=('gstreamer0.10-base-plugins: for more open formats'
-            'gstreamer0.10-good-plugins: for use with "Good" plugin libraries'
-            'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries'
-            'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries')
-source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('8b2025b8876f9f3fe33ef5001e0621f3a5d0f142')
-install=clementine.install
-
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DSTATIC_SQLITE=0
-   make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/clementine/clementine.install b/community-testing/clementine/clementine.install
deleted file mode 100644
index 2d71a7563..000000000
--- a/community-testing/clementine/clementine.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/gedit-plugins/PKGBUILD b/community-testing/gedit-plugins/PKGBUILD
deleted file mode 100644
index 6422ffdff..000000000
--- a/community-testing/gedit-plugins/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 44982 2011-04-13 22:04:45Z ibiru $
-#Maintainer:  Ionut Biru <ibiru@archlinux.org>
-#Contributor: Hugo Doria <hugo@archlinux.org>
-#Contributor: Sergej Chodarev <sergejx@centrum.sk>
-#Contributor: zhuqin <zhuqin83@gmail.com>
-
-pkgname=gedit-plugins
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="Set of plugins for gedit"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://live.gnome.org/GeditPlugins"
-depends=('gedit' 'dbus-python')
-makedepends=('intltool' 'gnome-doc-utils')
-options=('!libtool' '!emptydirs')
-install=gedit-plugins.install
-source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.0/$pkgname-$pkgver.tar.bz2)
-sha256sums=('39599b743ad3ebb1320832a78f2e7bfcbeb32393e990298756be2405a92bc29f')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all
-
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/gedit-plugins/gedit-plugins.install b/community-testing/gedit-plugins/gedit-plugins.install
deleted file mode 100644
index d5bcc00ae..000000000
--- a/community-testing/gedit-plugins/gedit-plugins.install
+++ /dev/null
@@ -1,23 +0,0 @@
-pkgname=gedit-plugins
-
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    usr/sbin/gconfpkg --uninstall ${pkgname}
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-
-post_remove() {
-  post_install $1
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/giggle/PKGBUILD b/community-testing/giggle/PKGBUILD
deleted file mode 100644
index 19f2d0e0f..000000000
--- a/community-testing/giggle/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 44519 2011-04-08 03:41:57Z tdziedzic $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: neodreams <yanbrodeur@gmail.com>
-
-pkgname=giggle
-pkgver=0.5
-pkgrel=5
-pkgdesc="Graphical frontend for the git directory tracker (think of gitk on GTK+)."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://live.gnome.org/giggle"
-license=('GPL')
-depends=('git' 'gtksourceview2')
-makedepends=('intltool' 'vte' 'evolution-data-server>=2.30.2.1')
-optdepends=('vte: for terminal plugin support'
-	    'evolution-data-server: details autocompletion')
-source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.5/${pkgname}-${pkgver}.tar.bz2)
-options=(!libtool)
-install=giggle.install
-sha256sums=('2e2c70d25159d31c87d155c9f799e0f1feb30fe26fc8aaf207ca6b3bd9b2b259')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure \
-    --prefix=/usr
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/giggle/giggle.install b/community-testing/giggle/giggle.install
deleted file mode 100644
index ec0c3f071..000000000
--- a/community-testing/giggle/giggle.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -f -t -q /usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
diff --git a/community-testing/gimmie/ChangeLog b/community-testing/gimmie/ChangeLog
deleted file mode 100644
index 7fd5bbf99..000000000
--- a/community-testing/gimmie/ChangeLog
+++ /dev/null
@@ -1,2 +0,0 @@
-2007-06-26 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
diff --git a/community-testing/gimmie/PKGBUILD b/community-testing/gimmie/PKGBUILD
deleted file mode 100644
index 2aefefda1..000000000
--- a/community-testing/gimmie/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 44484 2011-04-07 20:23:57Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=gimmie
-pkgver=0.2.8
-pkgrel=14
-pkgdesc="desktop organizer which allows interaction with applications, contacts, documents, etc"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://beatniksoftware.com/gimmie/"
-license=('LGPL')
-depends=('libgnomecups' 'dbus-python' 'python2-gconf' 'python-gnomeapplet'
-	 'python-gnomedesktop' 'python2-libgnome' 'python-wnck' 'pyxdg'
-	 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('findutils' 'perlxml')
-options=(!libtool)
-install=$pkgname.install
-source=(http://www.beatniksoftware.com/gimmie/releases/$pkgname-$pkgver.tar.gz)
-md5sums=('721b8ec80f0247e1281aeb4aa5614c2f')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's@^#!.*python$@#!/usr/bin/python2@' gimmie/gimmie_{threads,bar}.py
-
-  export CFLAGS="$CFLAGS `pkg-config --cflags glib-2.0`"
-  export LDFLAGS="$LDFLAGS `pkg-config --libs glib-2.0`"
-
-  export CFLAGS="$CFLAGS `pkg-config --cflags gtk+-2.0`"
-  export LDFLAGS="$LDFLAGS `pkg-config --libs gtk+-2.0`"
-
-  export CFLAGS="$CFLAGS `pkg-config --cflags pygtk-2.0`"
-  export LDFLAGS="$LDFLAGS `pkg-config --libs pygtk-2.0`"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir="/usr/lib/$pkgname" \
-              --disable-static --disable-schemas-install \
-              --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
-              PYTHON=/usr/bin/python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community-testing/gimmie/gimmie.install b/community-testing/gimmie/gimmie.install
deleted file mode 100644
index 015be0a4d..000000000
--- a/community-testing/gimmie/gimmie.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gimmie
-
-post_install() {
-  gconfpkg --install $pkgname
-  xdg-icon-resource forceupdate
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
-
-post_remove() {
-  xdg-icon-resource forceupdate
-}
diff --git a/community-testing/glipper/PKGBUILD b/community-testing/glipper/PKGBUILD
deleted file mode 100644
index f1fae4d4e..000000000
--- a/community-testing/glipper/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 44486 2011-04-07 20:24:38Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Pbl Gomez <pblgomez@gmail.com>
-
-pkgname=glipper
-pkgver=1.0
-pkgrel=12
-pkgdesc="Clipboard for gnome desktop"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/glipper/"
-license=("GPL")
-depends=('python2-gconf' 'python-gnomeapplet' 'python2-libgnome' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'perlxml' 'gnome-doc-utils')
-optdepends=('pycrypto: encrypted connection support in Network plugin')
-install=glipper.install
-options=(!emptydirs !libtool)
-source=(http://downloads.sourceforge.net/sourceforge/glipper/$pkgname-$pkgver.tar.bz2)
-md5sums=('95315e62b950877611d4645a0b47e1ba')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install
-
-  sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $pkgdir/usr/lib/glipper/glipper
-
-  install -dm755 ${pkgdir}/usr/share/gconf/schemas
-  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas $pkgdir/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/community-testing/glipper/glipper.install b/community-testing/glipper/glipper.install
deleted file mode 100644
index 72012f6cd..000000000
--- a/community-testing/glipper/glipper.install
+++ /dev/null
@@ -1,30 +0,0 @@
-pkgname=glipper
-
-post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  /usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
-  /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  echo "If you use Gnome, read http://glipper.sourceforge.net/ and remove ~/.glipper"
-  echo "If you don't use Gnome, use glipper-old package"
-  /bin/true
-}
-
-post_upgrade() {
-  /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
-  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
-  else
-    schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  fi
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
-}
-
diff --git a/community-testing/gnome-system-tools/PKGBUILD b/community-testing/gnome-system-tools/PKGBUILD
deleted file mode 100644
index 9b242bc59..000000000
--- a/community-testing/gnome-system-tools/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 44473 2011-04-07 19:13:54Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugodoria@archlinux-br.org>
-
-pkgname=gnome-system-tools
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Gnome System Configuration Utilities"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnome.org/projects/gst/"
-license=('GPL')
-options=('!libtool')
-depends=('wireless_tools' 'liboobs' 'nautilus' 'polkit-gnome' 'dconf')
-makedepends=('gnome-doc-utils' 'intltool')
-install=gnome-system-tools.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('905df26c02f00a6c2c18706ba3db7eab764e3df6576289e103504aa39a47ae0b')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    ./configure --prefix=/usr  --sysconfdir=/etc \
-	--localstatedir=/var --disable-scrollkeeper --disable-static \
-	--disable-services --disable-schemas-compile
-    make
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/gnome-system-tools/gnome-system-tools.install b/community-testing/gnome-system-tools/gnome-system-tools.install
deleted file mode 100644
index 25e333a19..000000000
--- a/community-testing/gnome-system-tools/gnome-system-tools.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
diff --git a/community-testing/gnote/PKGBUILD b/community-testing/gnote/PKGBUILD
deleted file mode 100644
index 7b6e577a2..000000000
--- a/community-testing/gnote/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 44493 2011-04-07 20:31:24Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: uastasi <uastasi@archlinux.us>
-pkgname=gnote
-pkgver=0.7.3
-pkgrel=4
-pkgdesc="Experimental port of Tomboy to C++ "
-arch=('i686' 'x86_64' 'mips64el')
-url="http://live.gnome.org/Gnote"
-license=('GPL')
-depends=('gtkmm' 'gconf' 'boost-libs' 'gtkspell' 'libxslt')
-makedepends=('intltool' 'gnome-doc-utils' 'boost')
-options=('!libtool')
-install=gnote.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4853315711baf7647cdae4c2f7d23e22e2b13322605efe3dd98796a06f928321')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-    ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --libexecdir=/usr/lib/gnote \
-        --disable-scrollkeeper \
-        --disable-schemas-install \
-        --disable-static
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-    install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-    gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnote ${pkgdir}/etc/gconf/schemas/*.schemas
-    rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/community-testing/gnote/gnote.install b/community-testing/gnote/gnote.install
deleted file mode 100644
index 780fae868..000000000
--- a/community-testing/gnote/gnote.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gnote
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-testing/gnote/gtk2.20.patch b/community-testing/gnote/gtk2.20.patch
deleted file mode 100644
index 13b3ee1a9..000000000
--- a/community-testing/gnote/gtk2.20.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b2e62adb1ed94f9a3f681bd6d0b8117b2ec3c1f9 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@src.gnome.org>
-Date: Sun, 14 Mar 2010 21:24:21 +0000
-Subject: Replaced deprecated macros -- GTK_WIDGET_REALIZED & GTK_WIDGET_VISIBLE
-
-These macros have been deprecated since Gtk+ 2.20, and their
-replacements were introduced in Gtk+ 2.18. Thus, the minimum Gtk+
-version has been bumped accordingly.
----
-diff --git a/configure.ac b/configure.ac
-index 564c0b0..0189b88 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,7 @@ AC_SUBST(GNOTE_VERSION)
- dnl all the library version.
- dnl if one is harcoded elsewhere, it is a bug
- 
--GTK_VERSION=2.12
-+GTK_VERSION=2.18
- LIBGLIBMM_VERSION=2.0
- LIBGTKMM_VERSION=2.12.0
- LIBGCONF_VERSION=2.0.0
-diff --git a/libtomboy/tomboyutil.c b/libtomboy/tomboyutil.c
-index 162e4a2..9de7e62 100644
---- a/libtomboy/tomboyutil.c
-+++ b/libtomboy/tomboyutil.c
-@@ -153,9 +153,9 @@ tomboy_window_override_user_time (GtkWindow *window)
- void
- tomboy_window_present_hardcore (GtkWindow *window)
- {
--	if (!GTK_WIDGET_REALIZED (window))
-+	if (!gtk_widget_get_realized (GTK_WIDGET (window)))
- 		gtk_widget_realize (GTK_WIDGET (window));
--	else if (GTK_WIDGET_VISIBLE (window))
-+	else if (gtk_widget_get_visible (GTK_WIDGET (window)))
- 		tomboy_window_move_to_current_workspace (window);
- 
- 	tomboy_window_override_user_time (window);
---
-cgit v0.8.3.1
diff --git a/community-testing/gnubiff/PKGBUILD b/community-testing/gnubiff/PKGBUILD
deleted file mode 100644
index 6bdb40527..000000000
--- a/community-testing/gnubiff/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 44789 2011-04-11 20:19:28Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Tom K <tomk@runbox.com>
-# Contributor: Todd Musall <tmusall@gmail.com>
-
-pkgname=gnubiff
-pkgver=2.2.13
-pkgrel=1
-pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://gnubiff.sourceforge.net/"
-license=("GPL")
-depends=('gnome-panel')
-makedepends=('perlxml')
-conflicts=(gnubiff-gtk)
-source=(http://downloads.sourceforge.net/gnubiff/gnubiff-$pkgver.tar.gz)
-md5sums=('65423957eb027b94c9e661611c0e4271')
-
-build() {
-  [ "$GNOMEDIR" = "" ] && GNOMEDIR=/usr
-  cd $startdir/src/gnubiff-$pkgver
-
-  patch -p2 src/support.h <<EOF
-diff -wbBur gnubiff-2.2.10/src/support.h gnubiff-2.2.10.my/src/support.h
---- gnubiff-2.2.10/src/support.h	2008-03-22 05:08:51.000000000 +0300
-+++ gnubiff-2.2.10.my/src/support.h	2008-04-22 14:21:58.000000000 +0400
-@@ -35,6 +35,9 @@
- #endif
- #include "nls.h"
- 
-+#include <stdlib.h>
-+#define EXIT_SUCCESS 0
-+#define EXIT_FAILURE 1
- 
- #include <glib.h>
- #include <sstream>
-@@ -131,6 +134,9 @@
- 		if ((pos == end) && (last < num))
- 			result << sep << num;
- 
-+		if ((pos == end) && (last != num))
-+		  result << sep << num;
-+	
- 		// Save new number
- 		inf_bound = last = num;
- 	}
-EOF
-
-  export LDFLAGS="$LDFLAGS -lgnomeui-2"
-  export CFLAGS="$CFLAGS -I/usr/include/libgnomeui-2.0"
-  export CPPFLAGS="$CPPFLAGS -I/usr/include/libgnomeui-2.0"
-  ./configure --prefix=/usr --with-password --with-password-string --disable-fam \
-	--disable-gnome
-  make
-  make DESTDIR=$startdir/pkg install
-
-  rm -rf ${pkgdir}/usr/share/info/dir
-}
diff --git a/community-testing/google-gadgets/PKGBUILD b/community-testing/google-gadgets/PKGBUILD
deleted file mode 100644
index fbe77e1be..000000000
--- a/community-testing/google-gadgets/PKGBUILD
+++ /dev/null
@@ -1,158 +0,0 @@
-# $Id: PKGBUILD 44556 2011-04-08 21:04:15Z spupykin $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-
-pkgbase=google-gadgets
-pkgname=('google-gadgets-common' 'google-gadgets-gtk' 'google-gadgets-qt')
-_realname=$pkgbase-for-linux
-_basedir="$startdir/pkg/base"
-pkgver=0.11.2
-_sover=1.0
-_sobump=0.0.0
-pkgrel=4
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/google-gadgets-for-linux/"
-license=('APACHE')
-makedepends=('gstreamer0.10-base-plugins' 'libwebkit'
-             'desktop-file-utils' 'xdg-utils'
-             'librsvg' 'curl' 'libsoup-gnome'
-             'qt'
-             'networkmanager'
-             'zip' 'flex')
-options=('!libtool')
-source=("http://google-gadgets-for-linux.googlecode.com/files/$_realname-$pkgver.tar.bz2"
-	"wifi-types.patch")
-md5sums=('279305553bcbf74f3e3615f6abc36a5e'
-         'f0df71c60a174e9d629db87b8bd9e102')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  # Building thrice is expensive;
-  #   we move files around instead
-  #
-  # xulrunner 2.0 is incompatible;
-  #   we build without smjs-script/browser-element
-
-  patch -p1 <$srcdir/wifi-types.patch
-  ./configure --prefix=/usr \
-              --disable-werror \
-              --disable-update-desktop-database \
-              --disable-update-mime-database \
-              --with-oem-brand=Arch \
-              --with-ssl-ca-file=/etc/ssl/certs/ca-certificates.crt \
-              --with-browser-plugins-dir=/usr/lib/mozilla/plugins \
-              --disable-gtkmoz-browser-element \
-              --disable-smjs-script-runtime
-  make
-}
-
-package_google-gadgets-common() {
-  pkgdesc="Desktop widgets from Google (common files)"
-  install=$pkgbase-common.install
-  depends=('hicolor-icon-theme' 'shared-mime-info')
-  optdepends=('google-gadgets-gtk: GTK+ (full) UI'
-              'google-gadgets-qt: Qt (partial) UI')
-
-  cd "$srcdir/$_realname-$pkgver"
-
-  make -j1 DESTDIR="$pkgdir/" install
-
-  # we need to remove stuff in this package
-  cp -a "$pkgdir" "$_basedir"
-
-  # do not force any removal; we want to know in case files change
-  cd "$pkgdir/usr"
-  rm -r bin
-  rm -r share/applications
-
-  cd "$pkgdir/usr/lib/$pkgbase"
-
-  # gtk-related
-  #rm gtkmoz-browser-child
-  rm ../lib*gtk*
-  rm modules/gtk*.so
-
-  # qt-related
-  rm ../lib*qt*
-  rm modules/qt*.so
-}
-
-package_google-gadgets-gtk() {
-  pkgdesc="Desktop widgets from Google (full GTK+ front-end)"
-  groups=('google-gadgets')
-  install=$pkgbase.install
-  depends=('google-gadgets-common'
-           'desktop-file-utils' 'xdg-utils'
-           'gstreamer0.10-base-plugins' 'libwebkit' 'libsoup-gnome'
-           'librsvg' 'curl')
-  optdepends=('networkmanager: desktop integration')
-
-  # install the gtk binary
-  cd "$_basedir"
-  install -Dm755 "usr/bin/ggl-gtk" "$pkgdir/usr/bin/ggl-gtk"
-
-  # gtk-only browser stuff
-  #install -Dm755 usr/lib/$pkgbase/gtkmoz-browser-child \
-  #  "$pkgdir/usr/lib/$pkgbase/gtkmoz-browser-child"
-
-  # now the gtk libraries
-  mkdir -p "$pkgdir/usr/lib/$pkgbase/modules"
-
-  install -m755 usr/lib/$pkgbase/modules/gtk*.so \
-    "$pkgdir/usr/lib/$pkgbase/modules/"
-
-  install -m755 usr/lib/lib*gtk* "$pkgdir/usr/lib"
-
-  # fix permissions and symlinks
-  find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \;
-
-  ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-gtk-$_sover.so"
-
-  ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-gtk-$_sover.so.0"
-
-  # freedesktop.org for gtk
-  install -Dm644 usr/share/applications/ggl-gtk.desktop \
-    "$pkgdir/usr/share/applications/ggl-gtk.desktop"
-
-  install -m644 usr/share/applications/ggl-designer.desktop \
-    "$pkgdir/usr/share/applications/"
-}
-
-package_google-gadgets-qt() {
-  pkgdesc="Desktop widgets from Google (partial Qt front-end)"
-  groups=('google-gadgets')
-  install=$pkgbase.install
-  depends=('google-gadgets-common' 'qt'
-           'desktop-file-utils' 'xdg-utils'
-           'gstreamer0.10-base-plugins' 'libwebkit')
-  optdepends=('networkmanager: desktop integration')
-
-  # install the qt binary
-  cd "$_basedir"
-  install -Dm755 usr/bin/ggl-qt "$pkgdir/usr/bin/ggl-qt"
-
-  # the qt libraries
-  mkdir -p "$pkgdir/usr/lib/$pkgbase/modules"
-
-  install -m755 usr/lib/$pkgbase/modules/qt*.so \
-    "$pkgdir/usr/lib/$pkgbase/modules/"
-
-  install -m755 usr/lib/lib*qt* "$pkgdir/usr/lib/"
-
-  # fix permissions and symlinks
-  find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \;
-
-  ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-qt-$_sover.so"
-
-  ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-qt-$_sover.so.0"
-
-  # freedesktop.org for qt
-  install -Dm644 usr/share/applications/ggl-qt.desktop \
-    "$pkgdir/usr/share/applications/ggl-qt.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/google-gadgets/google-gadgets-common.install b/community-testing/google-gadgets/google-gadgets-common.install
deleted file mode 100644
index 210cbc869..000000000
--- a/community-testing/google-gadgets/google-gadgets-common.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo "==> Updating desktop database..."
-  gtk-update-icon-cache --quiet usr/share/icons/hicolor
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/google-gadgets/google-gadgets.changelog b/community-testing/google-gadgets/google-gadgets.changelog
deleted file mode 100644
index 5b8f85a71..000000000
--- a/community-testing/google-gadgets/google-gadgets.changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-25 Mar 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 0.11.2-3:
-	xulrunner rebuild
-		- undepend on xulrunner (2.0 incompatible)
-		- disable smjs-script/browser-element
-	Cleaned up scriptlets (too many blank lines)
-	Added this changelog
diff --git a/community-testing/google-gadgets/google-gadgets.install b/community-testing/google-gadgets/google-gadgets.install
deleted file mode 100644
index fd88688fc..000000000
--- a/community-testing/google-gadgets/google-gadgets.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo "==> Updating desktop database..."
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/google-gadgets/wifi-types.patch b/community-testing/google-gadgets/wifi-types.patch
deleted file mode 100644
index be9383a61..000000000
--- a/community-testing/google-gadgets/wifi-types.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc	2009-03-15 04:12:42.000000000 +0000
-+++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc	2011-04-08 20:57:16.000000000 +0000
-@@ -23,17 +23,9 @@
- namespace framework {
- namespace linux_system {
- 
--#ifdef NM_DEVICE_TYPE_WIFI
- static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
- 
--#ifdef NM_DEVICE_TYPE_ETHERNET
- static const int kDeviceTypeEthernet = NM_DEVICE_TYPE_ETHERNET;
--#else
--static const int kDeviceTypeEthernet = DEVICE_TYPE_802_3_ETHERNET;
--#endif
- 
- static const int kDeviceTypeUnknown = 0;
- 
-diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc	2009-12-28 10:39:53.000000000 +0000
-+++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc	2011-04-08 20:57:39.000000000 +0000
-@@ -77,11 +77,7 @@
- 
- using namespace ggadget::dbus;
- 
--#ifdef NM_DEVICE_TYPE_WIFI
- static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
- 
- // Defined in nm 0.7
- static const int kDeviceStateActivated = 8;
diff --git a/community-testing/gphpedit/PKGBUILD b/community-testing/gphpedit/PKGBUILD
deleted file mode 100644
index 963c8d44a..000000000
--- a/community-testing/gphpedit/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 44458 2011-04-07 16:24:21Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gphpedit
-pkgver=0.9.98RC1
-pkgrel=2
-pkgdesc="a scintilla/gnome based editor specialized on php-files"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('libgnomeui>=2.18.1-2' 'libgtkhtml>=2.11.0' 'desktop-file-utils' 'libwebkit')
-url="http://www.gphpedit.org/"
-options=('!makeflags')
-install=gphpedit.install
-source=(http://www.gphpedit.org/sites/default/files/gphpedit-$pkgver.tar.gz
-	doc-fix.patch)
-md5sums=('cc3c5f50704fa0ed3ef3d4ac983db525'
-         'db5e427642af2971accbcd90812ae88c')
-
-build() {
-  cd ${srcdir}/*$pkgname*
-#  patch -Np1 -i ${srcdir}/doc-fix.patch
-
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-  make DESTDIR=$pkgdir install
-
-  # extend MimeType declaration
-  echo "MimeType=application/x-php;text-x-php-text/x-php-source;" >> \
-    $pkgdir/usr/share/applications/gphpedit.desktop
-}
diff --git a/community-testing/gphpedit/doc-fix.patch b/community-testing/gphpedit/doc-fix.patch
deleted file mode 100644
index 42dae5f72..000000000
--- a/community-testing/gphpedit/doc-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gphpedit-0.9.91/src/tab.c.orig	2008-07-08 00:21:04.000000000 +0200
-+++ gphpedit-0.9.91/src/tab.c	2008-07-08 00:20:50.000000000 +0200
-@@ -562,6 +562,17 @@
- 	if (long_filename)
- 		return long_filename;
- 
-+	// For ArchLinux - KISS ;)
-+	long_filename = tab_help_try_filename("/usr/share/doc/php/html/function.", command, ".html");
-+	if (long_filename)
-+		return long_filename;
-+	long_filename = tab_help_try_filename("/usr/share/doc/php/html/ref.", command, ".html");
-+	if (long_filename)
-+		return long_filename;
-+	long_filename = tab_help_try_filename("/usr/share/doc/php/html/", command, NULL);
-+	if (long_filename)
-+		return long_filename;
-+
- 	// For Gentoo, as much as I love it - it's twatty to put docs in a version specific folder like this!
- 	long_filename = tab_help_try_filename("/usr/doc/php-docs-200403/html/function.", command, ".html");
- 	if (long_filename)
diff --git a/community-testing/gphpedit/gphpedit.install b/community-testing/gphpedit/gphpedit.install
deleted file mode 100644
index 39bc96919..000000000
--- a/community-testing/gphpedit/gphpedit.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/ibus/PKGBUILD b/community-testing/ibus/PKGBUILD
deleted file mode 100644
index 1966162fa..000000000
--- a/community-testing/ibus/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Contributor: Rainy <rainylau(at)gmail(dot)com>
-# Contributor: Lee.MaRS <leemars at gmail dot com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=ibus
-pkgver=1.3.9
-pkgrel=3
-pkgdesc='Next Generation Input Bus for Linux.'
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-url='http://ibus.googlecode.com'
-depends=('dbus-python>=0.83.0' 'gconf' 'python2' 'pygtk' 'pyxdg' 'iso-codes' 'librsvg' 'python-notify' 'hicolor-icon-theme' 'gtk3')
-optdepends=('notification-daemon')
-makedepends=('intltool')
-options=('!libtool')
-install=ibus.install
-source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('57345a3c1cfe37ce3825f6221676dcfe')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  export PYTHON=python2
-
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/ibus \
-    --sysconfdir=/etc \
-    --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
-    --enable-gtk3
-    #--enable-introspection=no # disabled because build fails with 
-                              # gobject-introspection 0.9.10-2
-
-  # python2 fix
-  for file in setup/ibus-setup.in ui/gtk/ibus-ui-gtk.in; do
-    sed -i 's_exec python_exec python2_' $file
-  done
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  export PYTHON=python2
-
-  make DESTDIR=${pkgdir} install
-
-  find ${pkgdir} -type f -exec sed -i 's_exec /usr/bin/python_exec /usr/bin/python2_' {} \;
-}
diff --git a/community-testing/ibus/ibus.install b/community-testing/ibus/ibus.install
deleted file mode 100644
index 439f00b29..000000000
--- a/community-testing/ibus/ibus.install
+++ /dev/null
@@ -1,31 +0,0 @@
-post_install() {
-    echo "Updating gtk.immodules..."
-    /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-    echo "Done."
-
-    /usr/sbin/gconfpkg --install ibus
-    gtk-update-icon-cache -fq -t /usr/share/icons/hicolor
-
-    # update for gkt3
-    gtk-query-immodules-3.0 --update-cache 
-}
-
-pre_upgrade() {
-    pre_remove $1
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    /usr/sbin/gconfpkg --uninstall ibus
-}
-
-post_remove() {
-    /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-    gtk-update-icon-cache -fq -t /usr/share/icons/hicolor
-
-    # update for gkt3
-    gtk-query-immodules-3.0 --update-cache 
-}
diff --git a/community-testing/inputattach/0001-Add-w8001-flag.patch b/community-testing/inputattach/0001-Add-w8001-flag.patch
deleted file mode 100644
index ba6f9394b..000000000
--- a/community-testing/inputattach/0001-Add-w8001-flag.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 729257077e328e0b2fa1bba5a5509c09a743d5d0 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 13 Jul 2010 11:49:47 +1000
-Subject: [PATCH 2/3] Add w8001 flag for serial Wacom devices.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- inputattach.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/inputattach.c b/inputattach.c
-index a7de302..0382954 100644
---- a/inputattach.c
-+++ b/inputattach.c
-@@ -495,6 +495,9 @@ static struct input_types input_types[] = {
- { "--dump",		"-dump",	"Just enable device",
- 	B2400, CS8,
- 	0,			0x00,	0x00,	0,	dump_init },
-+{ "--w8001",		"-w8001",	"Wacom W8001",
-+	B38400, CS8,
-+	SERIO_W8001,		0x00,	0x00,	0,	NULL },
- { NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL }
- };
- 
--- 
-1.7.2.3
-
diff --git a/community-testing/inputattach/0002-Allow-for-custom-baud-rates.patch b/community-testing/inputattach/0002-Allow-for-custom-baud-rates.patch
deleted file mode 100644
index 78f5d19c8..000000000
--- a/community-testing/inputattach/0002-Allow-for-custom-baud-rates.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 5d9373f24f1b519c030024b2f36277ba9713697c Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 21 Jul 2010 14:41:04 +1000
-Subject: [PATCH 3/3] Allow for custom baud rates.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- inputattach.c |   25 ++++++++++++++++++++++++-
- 1 files changed, 24 insertions(+), 1 deletions(-)
-
-diff --git a/inputattach.c b/inputattach.c
-index 0382954..6806fc8 100644
---- a/inputattach.c
-+++ b/inputattach.c
-@@ -506,7 +506,7 @@ static void show_help(void)
- 	struct input_types *type;
- 
- 	puts("");
--	puts("Usage: inputattach [--daemon] <mode> <device>");
-+	puts("Usage: inputattach [--daemon] [--baud <baud>] <mode> <device>");
- 	puts("");
- 	puts("Modes:");
- 
-@@ -530,6 +530,7 @@ int main(int argc, char **argv)
- 	int i;
- 	char c;
- 	int retval;
-+	int baud = -1;
- 
- 	for (i = 1; i < argc; i++) {
- 		if (!strcasecmp(argv[i], "--help")) {
-@@ -540,6 +541,15 @@ int main(int argc, char **argv)
- 		} else if (need_device) {
- 			device = argv[i];
- 			need_device = 0;
-+		} else if (!strcasecmp(argv[i], "--baud")) {
-+			if (argc <= i + 1) {
-+				show_help();
-+				fprintf(stderr,
-+					"inputattach: require baud rate\n");
-+				return EXIT_FAILURE;
-+			}
-+
-+			baud = atoi(argv[++i]);
- 		} else {
- 			if (type && type->name) {
- 				fprintf(stderr,
-@@ -580,6 +590,19 @@ int main(int argc, char **argv)
- 		return 1;
- 	}
- 
-+	switch(baud) {
-+	case -1: break;
-+	case 2400: type->speed = B2400; break;
-+	case 4800: type->speed = B4800; break;
-+	case 9600: type->speed = B9600; break;
-+	case 19200: type->speed = B19200; break;
-+	case 38400: type->speed = B38400; break;
-+	default:
-+		fprintf(stderr, "inputattach: invalid baud rate '%d'\n",
-+				baud);
-+		return EXIT_FAILURE;
-+	}
-+
- 	setline(fd, type->flags, type->speed);
- 
- 	if (type->flush)
--- 
-1.7.2.3
-
diff --git a/community-testing/inputattach/PKGBUILD b/community-testing/inputattach/PKGBUILD
deleted file mode 100644
index b081de6c5..000000000
--- a/community-testing/inputattach/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
-
-pkgname=inputattach
-pkgver=1.24
-pkgrel=3
-pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://linuxconsole.sourceforge.net/"
-license=('GPL')
-depends=('bash')
-makedepends=('gcc')
-backup=(etc/conf.d/inputattach)
-install=inputattach.install
-source=('http://kernel.org/pub/linux/kernel/people/dtor/inputattach.c'
-	'http://kernel.org/pub/linux/kernel/people/dtor/serio-ids.h'
-	'inputattach.conf.d' 'inputattach.rc.d'
-        '0001-Add-w8001-flag.patch' '0002-Allow-for-custom-baud-rates.patch')
-md5sums=('eb595a766ca363edb3b14c25404596ce' '93d34d96cd3ad19ea1aeca7f68a66b4a'
-         '7ca903e54829764c8241233af5069216' '8d62f8840a2e6457a953f667df39ef99'
-         'f1b3ddae308351357f557cbd5c6cda81' '8f76908449cae24a95adbf0bc0a17721')
-
-build() {
-  cd "$srcdir"
-
-  # Add support for serial wacom tablets
-  patch -Np1 -i "$srcdir/0001-Add-w8001-flag.patch"
-  patch -Np1 -i "$srcdir/0002-Allow-for-custom-baud-rates.patch"
-
-  cc $CFLAGS inputattach.c -o inputattach
-}
-
-package() {
-  cd "$srcdir"
-
-  install -Dm755 inputattach \
-    "$pkgdir/usr/sbin/inputattach"
-
-  install -Dm644 $srcdir/inputattach.conf.d \
-    "$pkgdir/etc/conf.d/inputattach"
-
-  install -Dm755 $srcdir/inputattach.rc.d \
-    "$pkgdir/etc/rc.d/inputattach"
-}
diff --git a/community-testing/inputattach/inputattach.conf.d b/community-testing/inputattach/inputattach.conf.d
deleted file mode 100644
index ae8d1842a..000000000
--- a/community-testing/inputattach/inputattach.conf.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Configuration for inputattach
-#
-# IAPARAMS is an array of inputattach arguments, see 'inputattach --help'.
-# An inputattach instance will be started for each element.
-
-IAPARAMS=(
-  "--microsoft /dev/ttyS0"
-  #"--baud 9600 --w8001 /dev/ttyS1"
-)
diff --git a/community-testing/inputattach/inputattach.install b/community-testing/inputattach/inputattach.install
deleted file mode 100644
index b5381e14a..000000000
--- a/community-testing/inputattach/inputattach.install
+++ /dev/null
@@ -1,18 +0,0 @@
-## arg 1:  the new package version
-
-post_upgrade() {
-  (( $(vercmp 1.24-3 $2) > 0 )) && cat <<MSG
-ATTENTION:
-  /etc/conf.d/inputattach.conf has been replaced by /etc/conf.d/inputattach
-  Make sure you adjust the new config file, which has a new format.
-MSG
-}
-
-post_install() {
-  cat << EOF
-
-The correct device mode and /dev device file will need to be set in
-/etc/conf.d/inputattach before starting /etc/rc.d/inputattach
-
-EOF
-}
diff --git a/community-testing/inputattach/inputattach.rc.d b/community-testing/inputattach/inputattach.rc.d
deleted file mode 100644
index 6b92827be..000000000
--- a/community-testing/inputattach/inputattach.rc.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/inputattach
-
-case "$1" in
-  start)
-    stat_busy "Starting inputattach"
-    for param in ${IAPARAMS[@]}; do
-      if ! /usr/sbin/inputattach --daemon $param; then
-        stat_fail
-        exit 1
-      fi
-    done
-
-    add_daemon inputattach
-    stat_done
-    ;;
-  stop)
-    stat_busy "Stopping inputattach"
-    PID=`pidof -o %PPID /usr/sbin/inputattach`
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm_daemon inputattach
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/liboobs/PKGBUILD b/community-testing/liboobs/PKGBUILD
deleted file mode 100644
index 746af8e79..000000000
--- a/community-testing/liboobs/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 44470 2011-04-07 19:06:42Z ibiru $
-# Maintainer : Ionut Biru<ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugodoria@gmail.com>
-
-pkgname=liboobs
-pkgver=3.0.0
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-pkgdesc="A wrapping library to the System Tools Backends"
-url="ftp://ftp.gnome.org/pub/GNOME/sources/liboobs/"
-license=('GPL')
-depends=('system-tools-backends')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/liboobs/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1e7a327df7dcfa30e0cd3e0d2ffcd9a2c91c7870291dd30434b5da907945c00a')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure --prefix=/usr --disable-static
-    make
-}
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/perl-gtk2-webkit/ChangeLog b/community-testing/perl-gtk2-webkit/ChangeLog
deleted file mode 100644
index 9664112d0..000000000
--- a/community-testing/perl-gtk2-webkit/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-2009-04-16  Corrado Primier  <bardo@aur.archlinux.org>
-
-	* Release bump: 2
-
-2009-02-28  Corrado Primier  <bardo@aur.archlinux.org>
-
-	* Version bump: 0.04
-
-2008-12-01  Corrado Primier  <bardo@aur.archlinux.org>
-
-	* Release bump: 2
-
-	* PKGBUILD: fixed license (Artistic -> PerlArtistic)
-
-2008-12-01  Corrado Primier  <bardo@aur.archlinux.org>
-
-	* PKGBUILD: moved to [community]
diff --git a/community-testing/perl-gtk2-webkit/PKGBUILD b/community-testing/perl-gtk2-webkit/PKGBUILD
deleted file mode 100644
index 362605884..000000000
--- a/community-testing/perl-gtk2-webkit/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 44460 2011-04-07 16:27:39Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-
-pkgname=perl-gtk2-webkit
-pkgver=0.08
-pkgrel=3
-pkgdesc="Gtk2::WebKit"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://search.cpan.org/dist/Gtk2-WebKit"
-license=('GPL' 'PerlArtistic')
-depends=('perl>=5.10.0' 'gtk2-perl' 'libwebkit' 'perl-extutils-depends' 'perl-extutils-pkgconfig')
-options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/F/FL/FLORA/Gtk2-WebKit-$pkgver.tar.gz)
-md5sums=('5dc7e0ea470754f6e24e40e54da942ee')
-
-build() {
-  cd  $srcdir/Gtk2-WebKit-$pkgver
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-  make install DESTDIR=$pkgdir
-  find $pkgdir -name '.packlist' -delete
-  find $pkgdir -name '*.pod' -delete
-}
diff --git a/community-testing/shotwell/PKGBUILD b/community-testing/shotwell/PKGBUILD
deleted file mode 100644
index 978b33d71..000000000
--- a/community-testing/shotwell/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 45502 2011-04-22 15:22:48Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
-
-pkgname=shotwell
-pkgver=0.9.3
-pkgrel=1
-pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://yorba.org/shotwell/"
-license=('LGPL2.1')
-depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2'
-	 'libraw' 'librsvg' 'json-glib' 'desktop-file-utils' 'gnome-vfs')
-makedepends=('intltool' 'vala')
-install=shotwell.install
-source=(http://yorba.org/download/shotwell/0.9/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b1a3281be7d4ff8eac98289bcd129387')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure --prefix=/usr \
-	--with-gconf-schema-file-dir=/usr/share/gconf/schemas \
-	--disable-schemas-install \
-	--disable-desktop-update \
-	--disable-icon-update
-     make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/shotwell/shotwell.install b/community-testing/shotwell/shotwell.install
deleted file mode 100644
index 83c95a70f..000000000
--- a/community-testing/shotwell/shotwell.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=shotwell
-
-post_install() {
-  gtk-update-icon-cache -fq -t usr/share/icons/hicolor
-  usr/sbin/gconfpkg --install ${pkgname}
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -fq -t usr/share/icons/hicolor
-}
diff --git a/community-testing/surf/PKGBUILD b/community-testing/surf/PKGBUILD
deleted file mode 100644
index 3ac7a21e7..000000000
--- a/community-testing/surf/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 44535 2011-04-08 08:10:39Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Pierre Chapuis <catwell at archlinux dot us>
-# Contributor: Ray Kohler <ataraxia937 at gmail dot com>
-# Contributor: Michael Witten <mfwitten>
-
-pkgname=surf
-pkgver=0.4.1
-pkgrel=2
-pkgdesc="A simple web browser based on WebKit/GTK+."
-arch=('i686' 'x86_64' 'mips64el')
-url='http://surf.suckless.org/'
-license=('MIT')
-depends=('libwebkit')
-optdepends=('dmenu: URL-bar'
-            'wget: default download handler')
-makedepends=('pkgconfig')
-install='surf.install'
-source=("http://dl.suckless.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'config.h')
-md5sums=('28ac7a6d193d25844aa6b1db77fcbafa'
-         'a1d40e130189343a74f83166410f35d7')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  cp "${srcdir}/config.h" config.h
-
-  sed -i 's/CPPFLAGS =/CPPFLAGS +=/g' config.mk
-  sed -i 's/CFLAGS =/CFLAGS +=/g' config.mk
-  sed -i 's/LDFLAGS =/LDFLAGS +=/g' config.mk
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
-  install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community-testing/surf/config.h b/community-testing/surf/config.h
deleted file mode 100644
index c323a6239..000000000
--- a/community-testing/surf/config.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* modifier 0 means no modifier */
-static char *useragent      = "Surf/"VERSION" (X11; U; Unix; en-US) AppleWebKit/531.2+ Compatible (Safari)";
-static char *progress       = "#FF0000";
-static char *progress_trust = "#00FF00";
-static char *stylefile      = ".surf/style.css";
-static char *scriptfile     = ".surf/script.js";
-static char *cookiefile     = ".surf/cookies.txt";
-static time_t sessiontime   = 3600;
-#define NOBACKGROUND 0
-
-#define SETPROP(p, q)     { .v = (char *[]){ "/bin/sh", "-c", \
-	"prop=\"`xprop -id $2 $0 | cut -d '\"' -f 2 | dmenu`\" &&" \
-	"xprop -id $2 -f $1 8s -set $1 \"$prop\"", \
-	p, q, winid, NULL } }
-#define DOWNLOAD(d) { \
-	.v = (char *[]){ "/bin/sh", "-c", \
-	"xterm -e \"wget --load-cookies ~/.surf/cookies.txt '$0';\"", \
-	d, NULL } }
-#define MODKEY GDK_CONTROL_MASK
-static Key keys[] = {
-    /* modifier	            keyval      function    arg             Focus */
-    { MODKEY|GDK_SHIFT_MASK,GDK_r,      reload,     { .b = TRUE } },
-    { MODKEY,               GDK_r,      reload,     { .b = FALSE } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_p,      print,      { 0 } },
-    { MODKEY,               GDK_p,      clipboard,  { .b = TRUE } },
-    { MODKEY,               GDK_y,      clipboard,  { .b = FALSE } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_j,      zoom,       { .i = -1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_k,      zoom,       { .i = +1 } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_i,      zoom,       { .i = 0  } },
-    { MODKEY,               GDK_l,      navigate,   { .i = +1 } },
-    { MODKEY,               GDK_h,      navigate,   { .i = -1 } },
-    { MODKEY,               GDK_j,      scroll,     { .i = +1 } },
-    { MODKEY,               GDK_k,      scroll,     { .i = -1 } },
-    { 0,                    GDK_Escape, stop,       { 0 } },
-    { MODKEY,               GDK_o,      source,     { 0 } },
-    { MODKEY,               GDK_g,      spawn,      SETPROP("_SURF_URI", "_SURF_GO") },
-    { MODKEY,               GDK_slash,  spawn,      SETPROP("_SURF_FIND", "_SURF_FIND") },
-    { MODKEY,               GDK_n,      find,       { .b = TRUE } },
-    { MODKEY|GDK_SHIFT_MASK,GDK_n,      find,       { .b = FALSE } },
-};
diff --git a/community-testing/surf/surf.install b/community-testing/surf/surf.install
deleted file mode 100644
index 8511ab907..000000000
--- a/community-testing/surf/surf.install
+++ /dev/null
@@ -1,28 +0,0 @@
-pre_install() {
-  echo "-- Edit config.h in PKGBUILD's directory (generally /var/abs/community/surf/)"
-  echo "-- and rebuild package if you want to change settings."
-  /bin/true
-}
-
-post_install() {
-  /bin/true
-}
-
-pre_upgrade() {
-  echo "-- Edit config.h in PKGBUILD's directory (generally /var/abs/community/surf/)"
-  echo "-- and rebuild package if you want to change settings."
-  /bin/true
-}
-
-post_upgrade() {
-  /bin/true
-}
-
-pre_remove() {
-  /bin/true
-}
-
-post_remove() {
-  /bin/true
-}
-
diff --git a/community-testing/system-tools-backends/PKGBUILD b/community-testing/system-tools-backends/PKGBUILD
deleted file mode 100644
index 68b15f61e..000000000
--- a/community-testing/system-tools-backends/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=system-tools-backends
-pkgver=2.10.2
-pkgrel=1
-pkgdesc='Backends for Gnome System Tools.'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://system-tools-backends.freedesktop.org/'
-license=('GPL')
-depends=('perl' 'perl-net-dbus' 'dbus' 'polkit' 'dbus-glib')
-makedepends=('perlxml' 'pkgconfig' 'intltool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.10/${pkgname}-${pkgver}.tar.bz2)
-install=system-tools-backends.install
-sha256sums=('1dbe5177df46a9c7250735e05e77129fe7ec04840771accfa87690111ca2c670')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure \
-    --prefix=/usr \
-    --with-dbus-sys=/etc/dbus-1/system.d \
-    --localstatedir=/var \
-    --mandir=/usr/share \
-    --disable-static
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  #clean up man
-  rm -rf $pkgdir/usr/share/system-tools-backends-2.0/modules/share/
-}
diff --git a/community-testing/system-tools-backends/system-tools-backends.install b/community-testing/system-tools-backends/system-tools-backends.install
deleted file mode 100644
index e83a93525..000000000
--- a/community-testing/system-tools-backends/system-tools-backends.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    echo "==> Daemon method deprecated. Now is starting automatically at login"
-    echo "==> Remove stbd from DAEMONS list"
-}
-
-post_upgrade() {
-    if [ `vercmp $2 2.6.1-2` -eq 0 ]; then
-	echo "Removing stb-admin group"
-	groupdel stb-admin &> /dev/null
-    fi
-    post_install $1
-}
diff --git a/community-testing/uzbl/PKGBUILD b/community-testing/uzbl/PKGBUILD
deleted file mode 100644
index 11e8a3b63..000000000
--- a/community-testing/uzbl/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 45245 2011-04-18 20:59:54Z lcarlier $
-# Maintainer : Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Dieter Plaetinck <dieter@plaetinck.be>
-
-pkgbase=uzbl
-pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed')
-pkgver=2011.04.12
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.uzbl.org"
-license=('GPL3')
-makedepends=('git' 'pkgconfig' 'libwebkit>=1.3.13')
-source=(uzbl-$pkgver.tar.gz::http://github.com/Dieterbe/uzbl/tarball/$pkgver)
-md5sums=('27e82c838b8136dafb0683fa52ffc701')
-
-build() {
-    cd "$srcdir"/Dieterbe-uzbl-*
-
-    # python2 fix
-    for file in examples/data/scripts/uzbl*; do
-        sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
-    done
-    sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-           -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-           $(find ./ -name '*.py')
-
-    make
-}
-
-package_uzbl-core() {
-   pkgdesc="Webpage interface component meant for integration with other tools and scripts"
-   depends=('libwebkit>=1.3.13')
-   optdepends=('socat: to interface with the socket' 'dmenu: to run some of the example scripts'
-               'zenity: to run some of the example scripts'
-               'python2: to run some of the example scripts'
-               'xclip: for clipboard related keybindings'
-	       'pygtk: for uzbl-tabbed')
-   install=uzbl.install
-
-   cd "$srcdir"/Dieterbe-uzbl-*
-
-   make DESTDIR="$pkgdir" PREFIX=/usr  install-uzbl-core
-}
-
-package_uzbl-browser() {
-   pkgdesc="A complete browser experience based on uzbl-core"
-   depends=("uzbl-core=$pkgver" 'socat' 'zenity' 'xclip' 'dmenu' 'python2')
-
-   cd "$srcdir"/Dieterbe-uzbl-*
-
-   make DESTDIR="$pkgdir" PREFIX=/usr  install-uzbl-browser
-}
-
-package_uzbl-tabbed() {
-   pkgdesc="Tabbing manager providing multiple uzbl-browser instances in 1 window"
-   depends=("uzbl-browser=$pkgver" 'pygtk')
-
-   cd "$srcdir"/Dieterbe-uzbl-*
-
-   make DESTDIR="$pkgdir" PREFIX=/usr install-uzbl-tabbed
-}
-
diff --git a/community-testing/uzbl/uzbl.install b/community-testing/uzbl/uzbl.install
deleted file mode 100644
index ca5fc814b..000000000
--- a/community-testing/uzbl/uzbl.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  /bin/true
-}
-
-post_upgrade() {
-  echo "Some incompatibily are introduced, please refer to http://www.uzbl.org/news.php?id=32"
-}
-
-pre_remove() {
-  /bin/true
-}
-
-post_remove() {
-  /bin/true
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/workrave/PKGBUILD b/community-testing/workrave/PKGBUILD
deleted file mode 100644
index 7cbc54dd4..000000000
--- a/community-testing/workrave/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 44736 2011-04-11 12:32:49Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: William Rea <sillywilly@gmail.com>
-
-pkgname=workrave
-pkgver=1.9.4
-pkgrel=1
-pkgdesc="a tool to help RSI"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
-url="http://workrave.org"
-depends=('libgnomeuimm' 'gnet' 'gnome-panel' 'dbus' 'libxmu' 'gdome2' 'python-cheetah' 'libsigc++'
-	 'libxtst' 'python-cheetah')
-makedepends=('intltool')
-source=(http://downloads.sourceforge.net/workrave/workrave-$pkgver.tar.gz)
-md5sums=('d5eaf399b38b063053cff1a8527cba8e')
-
-build() {
-  cd $srcdir/workrave-$pkgver
-  export PYTHON=python2
-  ./configure --prefix=/usr --enable-dbus --sysconfdir=/etc --libexecdir=/usr/lib/workrave \
-	--disable-pulse
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community/cherrypy/837.2049.patch b/community/cherrypy/837.2049.patch
deleted file mode 100644
index 20cc0dd36..000000000
--- a/community/cherrypy/837.2049.patch
+++ /dev/null
@@ -1,554 +0,0 @@
-Index: cherrypy/test/test_tools.py
-===================================================================
---- cherrypy/test/test_tools.py	(revision 2049)
-+++ cherrypy/test/test_tools.py	(working copy)
-@@ -3,6 +3,7 @@
- import gzip
- import StringIO
- import sys
-+from httplib import IncompleteRead
- import time
- timeout = 0.2
- 
-@@ -272,8 +273,12 @@
-             # Because this error is raised after the response body has
-             # started, and because it's chunked output, an error is raised by
-             # the HTTP client when it encounters incomplete output.
--            self.assertRaises(ValueError, self.getPage,
--                              "/demo/errinstream?id=5")
-+            if sys.version_info[:2] >= (2, 6):
-+                self.assertRaises(IncompleteRead, self.getPage,
-+                                  "/demo/errinstream?id=5")
-+            else:
-+                self.assertRaises(ValueError, self.getPage,
-+                                  "/demo/errinstream?id=5")
-         # If this fails, then on_end_request isn't being called at all.
-         time.sleep(0.1)
-         self.getPage("/demo/ended/5")
-Index: cherrypy/test/webtest.py
-===================================================================
---- cherrypy/test/webtest.py	(revision 2049)
-+++ cherrypy/test/webtest.py	(working copy)
-@@ -491,7 +491,7 @@
-                     # IN6ADDR_ANY, which should respond on localhost.
-                     host = "::1"
-                 conn = http_conn(host, port)
--            
-+
-             conn._http_vsn_str = protocol
-             conn._http_vsn = int("".join([x for x in protocol if x.isdigit()]))
-             
-Index: cherrypy/test/test_encoding.py
-===================================================================
---- cherrypy/test/test_encoding.py	(revision 2049)
-+++ cherrypy/test/test_encoding.py	(working copy)
-@@ -1,7 +1,9 @@
- from cherrypy.test import test
- test.prefer_parent_path()
- 
-+import sys
- import gzip, StringIO
-+from httplib import IncompleteRead
- import cherrypy
- europoundUnicode = u'\x80\xa3'
- europoundUtf8 = u'\x80\xa3'.encode('utf-8')
-@@ -160,10 +162,13 @@
-         else:
-             # The wsgiserver will simply stop sending data, and the HTTP client
-             # will error due to an incomplete chunk-encoded stream.
--            self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream',
--                              headers=[("Accept-Encoding", "gzip")])
-+            if sys.version_info[:2] >= (2, 6):
-+                self.assertRaises(IncompleteRead, self.getPage, '/gzip/noshow_stream',
-+                                  headers=[("Accept-Encoding", "gzip")])
-+            else:
-+                self.assertRaises(ValueError, self.getPage, '/gzip/noshow_stream',
-+                                  headers=[("Accept-Encoding", "gzip")])
- 
--
- if __name__ == "__main__":
-     setup_server()
-     helper.testmain()
-Index: cherrypy/test/test_core.py
-===================================================================
---- cherrypy/test/test_core.py	(revision 2049)
-+++ cherrypy/test/test_core.py	(working copy)
-@@ -7,6 +7,7 @@
- localDir = os.path.dirname(__file__)
- import sys
- import types
-+from httplib import IncompleteRead
- 
- import cherrypy
- from cherrypy import _cptools, tools
-@@ -760,8 +761,12 @@
-             else:
-                 # Under HTTP/1.1, the chunked transfer-coding is used.
-                 # The HTTP client will choke when the output is incomplete.
--                self.assertRaises(ValueError, self.getPage,
--                                  "/error/page_streamed")
-+                if sys.version_info[:2] >= (2, 6):
-+                    self.assertRaises(IncompleteRead, self.getPage,
-+                                      "/error/page_streamed")
-+                else:
-+                    self.assertRaises(ValueError, self.getPage,
-+                                      "/error/page_streamed")
-             
-             # No traceback should be present
-             self.getPage("/error/cause_err_in_finalize")
-Index: cherrypy/wsgiserver/__init__.py
-===================================================================
---- cherrypy/wsgiserver/__init__.py	(revision 2049)
-+++ cherrypy/wsgiserver/__init__.py	(working copy)
-@@ -713,148 +713,325 @@
-     """Exception raised when the SSL implementation signals a fatal alert."""
-     pass
- 
-+if sys.version_info[:2] >= (2, 6) or sys.version_info[:3] >= (2, 5, 2):
-+    class CP_fileobject(socket._fileobject):
-+        """Faux file object attached to a socket object."""
- 
--class CP_fileobject(socket._fileobject):
--    """Faux file object attached to a socket object."""
--    
--    def sendall(self, data):
--        """Sendall for non-blocking sockets."""
--        while data:
--            try:
--                bytes_sent = self.send(data)
--                data = data[bytes_sent:]
--            except socket.error, e:
--                if e.args[0] not in socket_errors_nonblocking:
--                    raise
--    
--    def send(self, data):
--        return self._sock.send(data)
--    
--    def flush(self):
--        if self._wbuf:
--            buffer = "".join(self._wbuf)
--            self._wbuf = []
--            self.sendall(buffer)
--    
--    def recv(self, size):
--        while True:
--            try:
--                return self._sock.recv(size)
--            except socket.error, e:
--                if e.args[0] not in socket_errors_nonblocking:
--                    raise
--    
--    def read(self, size=-1):
--        if size < 0:
--            # Read until EOF
--            buffers = [self._rbuf]
--            self._rbuf = ""
--            if self._rbufsize <= 1:
--                recv_size = self.default_bufsize
-+        def sendall(self, data):
-+            """Sendall for non-blocking sockets."""
-+            while data:
-+                try:
-+                    bytes_sent = self.send(data)
-+                    data = data[bytes_sent:]
-+                except socket.error, e:
-+                    if e.args[0] not in socket_errors_nonblocking:
-+                        raise
-+
-+        def send(self, data):
-+            return self._sock.send(data)
-+
-+        def flush(self):
-+            if self._wbuf:
-+                buffer = "".join(self._wbuf)
-+                self._wbuf = []
-+                self.sendall(buffer)
-+
-+        def recv(self, size):
-+            while True:
-+                try:
-+                    return self._sock.recv(size)
-+                except socket.error, e:
-+                    if e.args[0] not in socket_errors_nonblocking:
-+                        raise
-+
-+        def read(self, size=-1):
-+            # Use max, disallow tiny reads in a loop as they are very inefficient.
-+            # We never leave read() with any leftover data from a new recv() call
-+            # in our internal buffer.
-+            rbufsize = max(self._rbufsize, self.default_bufsize)
-+            # Our use of StringIO rather than lists of string objects returned by
-+            # recv() minimizes memory usage and fragmentation that occurs when
-+            # rbufsize is large compared to the typical return value of recv().
-+            buf = self._rbuf
-+            buf.seek(0, 2)  # seek end
-+            if size < 0:
-+                # Read until EOF
-+                self._rbuf = StringIO.StringIO()  # reset _rbuf.  we consume it via buf.
-+                while True:
-+                    data = self.recv(rbufsize)
-+                    if not data:
-+                        break
-+                    buf.write(data)
-+                return buf.getvalue()
-             else:
--                recv_size = self._rbufsize
--            
-+                # Read until size bytes or EOF seen, whichever comes first
-+                buf_len = buf.tell()
-+                if buf_len >= size:
-+                    # Already have size bytes in our buffer?  Extract and return.
-+                    buf.seek(0)
-+                    rv = buf.read(size)
-+                    self._rbuf = StringIO.StringIO()
-+                    self._rbuf.write(buf.read())
-+                    return rv
-+
-+                self._rbuf = StringIO.StringIO()  # reset _rbuf.  we consume it via buf.
-+                while True:
-+                    left = size - buf_len
-+                    # recv() will malloc the amount of memory given as its
-+                    # parameter even though it often returns much less data
-+                    # than that.  The returned data string is short lived
-+                    # as we copy it into a StringIO and free it.  This avoids
-+                    # fragmentation issues on many platforms.
-+                    data = self.recv(left)
-+                    if not data:
-+                        break
-+                    n = len(data)
-+                    if n == size and not buf_len:
-+                        # Shortcut.  Avoid buffer data copies when:
-+                        # - We have no data in our buffer.
-+                        # AND
-+                        # - Our call to recv returned exactly the
-+                        #   number of bytes we were asked to read.
-+                        return data
-+                    if n == left:
-+                        buf.write(data)
-+                        del data  # explicit free
-+                        break
-+                    assert n <= left, "recv(%d) returned %d bytes" % (left, n)
-+                    buf.write(data)
-+                    buf_len += n
-+                    del data  # explicit free
-+                    #assert buf_len == buf.tell()
-+                return buf.getvalue()
-+
-+        def readline(self, size=-1):
-+            buf = self._rbuf
-+            buf.seek(0, 2)  # seek end
-+            if buf.tell() > 0:
-+                # check if we already have it in our buffer
-+                buf.seek(0)
-+                bline = buf.readline(size)
-+                if bline.endswith('\n') or len(bline) == size:
-+                    self._rbuf = StringIO.StringIO()
-+                    self._rbuf.write(buf.read())
-+                    return bline
-+                del bline
-+            if size < 0:
-+                # Read until \n or EOF, whichever comes first
-+                if self._rbufsize <= 1:
-+                    # Speed up unbuffered case
-+                    buf.seek(0)
-+                    buffers = [buf.read()]
-+                    self._rbuf = StringIO.StringIO()  # reset _rbuf.  we consume it via buf.
-+                    data = None
-+                    recv = self.recv
-+                    while data != "\n":
-+                        data = recv(1)
-+                        if not data:
-+                            break
-+                        buffers.append(data)
-+                    return "".join(buffers)
-+
-+                buf.seek(0, 2)  # seek end
-+                self._rbuf = StringIO.StringIO()  # reset _rbuf.  we consume it via buf.
-+                while True:
-+                    data = self.recv(self._rbufsize)
-+                    if not data:
-+                        break
-+                    nl = data.find('\n')
-+                    if nl >= 0:
-+                        nl += 1
-+                        buf.write(data[:nl])
-+                        self._rbuf.write(data[nl:])
-+                        del data
-+                        break
-+                    buf.write(data)
-+                return buf.getvalue()
-+            else:
-+                # Read until size bytes or \n or EOF seen, whichever comes first
-+                buf.seek(0, 2)  # seek end
-+                buf_len = buf.tell()
-+                if buf_len >= size:
-+                    buf.seek(0)
-+                    rv = buf.read(size)
-+                    self._rbuf = StringIO.StringIO()
-+                    self._rbuf.write(buf.read())
-+                    return rv
-+                self._rbuf = StringIO.StringIO()  # reset _rbuf.  we consume it via buf.
-+                while True:
-+                    data = self.recv(self._rbufsize)
-+                    if not data:
-+                        break
-+                    left = size - buf_len
-+                    # did we just receive a newline?
-+                    nl = data.find('\n', 0, left)
-+                    if nl >= 0:
-+                        nl += 1
-+                        # save the excess data to _rbuf
-+                        self._rbuf.write(data[nl:])
-+                        if buf_len:
-+                            buf.write(data[:nl])
-+                            break
-+                        else:
-+                            # Shortcut.  Avoid data copy through buf when returning
-+                            # a substring of our first recv().
-+                            return data[:nl]
-+                    n = len(data)
-+                    if n == size and not buf_len:
-+                        # Shortcut.  Avoid data copy through buf when
-+                        # returning exactly all of our first recv().
-+                        return data
-+                    if n >= left:
-+                        buf.write(data[:left])
-+                        self._rbuf.write(data[left:])
-+                        break
-+                    buf.write(data)
-+                    buf_len += n
-+                    #assert buf_len == buf.tell()
-+                return buf.getvalue()
-+
-+else:
-+    class CP_fileobject(socket._fileobject):
-+        """Faux file object attached to a socket object."""
-+
-+        def sendall(self, data):
-+            """Sendall for non-blocking sockets."""
-+            while data:
-+                try:
-+                    bytes_sent = self.send(data)
-+                    data = data[bytes_sent:]
-+                except socket.error, e:
-+                    if e.args[0] not in socket_errors_nonblocking:
-+                        raise
-+
-+        def send(self, data):
-+            return self._sock.send(data)
-+
-+        def flush(self):
-+            if self._wbuf:
-+                buffer = "".join(self._wbuf)
-+                self._wbuf = []
-+                self.sendall(buffer)
-+
-+        def recv(self, size):
-             while True:
--                data = self.recv(recv_size)
--                if not data:
--                    break
--                buffers.append(data)
--            return "".join(buffers)
--        else:
--            # Read until size bytes or EOF seen, whichever comes first
--            data = self._rbuf
--            buf_len = len(data)
--            if buf_len >= size:
--                self._rbuf = data[size:]
--                return data[:size]
--            buffers = []
--            if data:
--                buffers.append(data)
--            self._rbuf = ""
--            while True:
--                left = size - buf_len
--                recv_size = max(self._rbufsize, left)
--                data = self.recv(recv_size)
--                if not data:
--                    break
--                buffers.append(data)
--                n = len(data)
--                if n >= left:
--                    self._rbuf = data[left:]
--                    buffers[-1] = data[:left]
--                    break
--                buf_len += n
--            return "".join(buffers)
-+                try:
-+                    return self._sock.recv(size)
-+                except socket.error, e:
-+                    if e.args[0] not in socket_errors_nonblocking:
-+                        raise
- 
--    def readline(self, size=-1):
--        data = self._rbuf
--        if size < 0:
--            # Read until \n or EOF, whichever comes first
--            if self._rbufsize <= 1:
--                # Speed up unbuffered case
--                assert data == ""
-+        def read(self, size=-1):
-+            if size < 0:
-+                # Read until EOF
-+                buffers = [self._rbuf]
-+                self._rbuf = ""
-+                if self._rbufsize <= 1:
-+                    recv_size = self.default_bufsize
-+                else:
-+                    recv_size = self._rbufsize
-+
-+                while True:
-+                    data = self.recv(recv_size)
-+                    if not data:
-+                        break
-+                    buffers.append(data)
-+                return "".join(buffers)
-+            else:
-+                # Read until size bytes or EOF seen, whichever comes first
-+                data = self._rbuf
-+                buf_len = len(data)
-+                if buf_len >= size:
-+                    self._rbuf = data[size:]
-+                    return data[:size]
-                 buffers = []
--                while data != "\n":
--                    data = self.recv(1)
-+                if data:
-+                    buffers.append(data)
-+                self._rbuf = ""
-+                while True:
-+                    left = size - buf_len
-+                    recv_size = max(self._rbufsize, left)
-+                    data = self.recv(recv_size)
-                     if not data:
-                         break
-                     buffers.append(data)
-+                    n = len(data)
-+                    if n >= left:
-+                        self._rbuf = data[left:]
-+                        buffers[-1] = data[:left]
-+                        break
-+                    buf_len += n
-                 return "".join(buffers)
--            nl = data.find('\n')
--            if nl >= 0:
--                nl += 1
--                self._rbuf = data[nl:]
--                return data[:nl]
--            buffers = []
--            if data:
--                buffers.append(data)
--            self._rbuf = ""
--            while True:
--                data = self.recv(self._rbufsize)
--                if not data:
--                    break
--                buffers.append(data)
-+
-+        def readline(self, size=-1):
-+            data = self._rbuf
-+            if size < 0:
-+                # Read until \n or EOF, whichever comes first
-+                if self._rbufsize <= 1:
-+                    # Speed up unbuffered case
-+                    assert data == ""
-+                    buffers = []
-+                    while data != "\n":
-+                        data = self.recv(1)
-+                        if not data:
-+                            break
-+                        buffers.append(data)
-+                    return "".join(buffers)
-                 nl = data.find('\n')
-                 if nl >= 0:
-                     nl += 1
-                     self._rbuf = data[nl:]
--                    buffers[-1] = data[:nl]
--                    break
--            return "".join(buffers)
--        else:
--            # Read until size bytes or \n or EOF seen, whichever comes first
--            nl = data.find('\n', 0, size)
--            if nl >= 0:
--                nl += 1
--                self._rbuf = data[nl:]
--                return data[:nl]
--            buf_len = len(data)
--            if buf_len >= size:
--                self._rbuf = data[size:]
--                return data[:size]
--            buffers = []
--            if data:
--                buffers.append(data)
--            self._rbuf = ""
--            while True:
--                data = self.recv(self._rbufsize)
--                if not data:
--                    break
--                buffers.append(data)
--                left = size - buf_len
--                nl = data.find('\n', 0, left)
-+                    return data[:nl]
-+                buffers = []
-+                if data:
-+                    buffers.append(data)
-+                self._rbuf = ""
-+                while True:
-+                    data = self.recv(self._rbufsize)
-+                    if not data:
-+                        break
-+                    buffers.append(data)
-+                    nl = data.find('\n')
-+                    if nl >= 0:
-+                        nl += 1
-+                        self._rbuf = data[nl:]
-+                        buffers[-1] = data[:nl]
-+                        break
-+                return "".join(buffers)
-+            else:
-+                # Read until size bytes or \n or EOF seen, whichever comes first
-+                nl = data.find('\n', 0, size)
-                 if nl >= 0:
-                     nl += 1
-                     self._rbuf = data[nl:]
--                    buffers[-1] = data[:nl]
--                    break
--                n = len(data)
--                if n >= left:
--                    self._rbuf = data[left:]
--                    buffers[-1] = data[:left]
--                    break
--                buf_len += n
--            return "".join(buffers)
-+                    return data[:nl]
-+                buf_len = len(data)
-+                if buf_len >= size:
-+                    self._rbuf = data[size:]
-+                    return data[:size]
-+                buffers = []
-+                if data:
-+                    buffers.append(data)
-+                self._rbuf = ""
-+                while True:
-+                    data = self.recv(self._rbufsize)
-+                    if not data:
-+                        break
-+                    buffers.append(data)
-+                    left = size - buf_len
-+                    nl = data.find('\n', 0, left)
-+                    if nl >= 0:
-+                        nl += 1
-+                        self._rbuf = data[nl:]
-+                        buffers[-1] = data[:nl]
-+                        break
-+                    n = len(data)
-+                    if n >= left:
-+                        self._rbuf = data[left:]
-+                        buffers[-1] = data[:left]
-+                        break
-+                    buf_len += n
-+                return "".join(buffers)
-     
- 
- class SSL_fileobject(CP_fileobject):
diff --git a/community/cherrypy/ChangeLog b/community/cherrypy/ChangeLog
deleted file mode 100644
index 90276417c..000000000
--- a/community/cherrypy/ChangeLog
+++ /dev/null
@@ -1,26 +0,0 @@
-
-2009-04-15  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 3.1.2
-
-2008-12-14  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 3.1.1
-
-2008-11-04  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for python 2.6
-	* Thanks to David Moore
-
-2008-07-09  Mateusz Herych <heniekk@gmail.com>
-
-	* Updating for x86_64: 3.1.0
-
-2008-07-09  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updating for i686: 3.1.0
-
-2008-02-28  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Updating in i686:  3.0.3
-
diff --git a/community/cherrypy/PKGBUILD b/community/cherrypy/PKGBUILD
deleted file mode 100644
index 4483f649d..000000000
--- a/community/cherrypy/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-$Id: PKGBUILD 40928 2011-03-01 19:03:36Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Armando M. Baratti <amblistas@ajato.com.br>
-# Contributor: Florian Richter <Florian_Richter@gmx.de>
-pkgname=cherrypy
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="A pythonic, object-oriented web development framework"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.cherrypy.org"
-license=('BSD')
-depends=('python2')
-source=(http://download.cherrypy.org/cherrypy/$pkgver/CherryPy-$pkgver.tar.gz 
-	license)
-md5sums=('e5c1322bf5ce962c16283ab7a6dcca3f'
-         '22365dc6b0e6835b53da009aa36af017')
-
-build() {
-    cd $srcdir/CherryPy-$pkgver
-    python2 ./setup.py install --root=$pkgdir
-    install -D -m644 $srcdir/license $pkgdir/usr/share/licenses/$pkgname/license
-}
diff --git a/community/cherrypy/license b/community/cherrypy/license
deleted file mode 100644
index 32e9cf6bd..000000000
--- a/community/cherrypy/license
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2004, CherryPy Team (team@cherrypy.org)
-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.
-    * Neither the name of the CherryPy Team nor the names of its contributors 
-      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/community/gecko-mediaplayer/gecko-mediaplayer-xulrunner2.0.patch b/community/gecko-mediaplayer/gecko-mediaplayer-xulrunner2.0.patch
deleted file mode 100644
index 59d934c89..000000000
--- a/community/gecko-mediaplayer/gecko-mediaplayer-xulrunner2.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/np_entry.cpp
-===================================================================
---- src/np_entry.cpp.orig
-+++ src/np_entry.cpp
-@@ -175,7 +175,6 @@ NPError OSCALL NP_Initialize(NPNetscapeF
-     pluginFuncs->javaClass = NPP_GetJavaClass();
- #endif
- 
--    NPP_Initialize();
- #endif
- 
-     return NPERR_NO_ERROR;
diff --git a/community/gnote/gtk2.20.patch b/community/gnote/gtk2.20.patch
deleted file mode 100644
index 13b3ee1a9..000000000
--- a/community/gnote/gtk2.20.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b2e62adb1ed94f9a3f681bd6d0b8117b2ec3c1f9 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@src.gnome.org>
-Date: Sun, 14 Mar 2010 21:24:21 +0000
-Subject: Replaced deprecated macros -- GTK_WIDGET_REALIZED & GTK_WIDGET_VISIBLE
-
-These macros have been deprecated since Gtk+ 2.20, and their
-replacements were introduced in Gtk+ 2.18. Thus, the minimum Gtk+
-version has been bumped accordingly.
----
-diff --git a/configure.ac b/configure.ac
-index 564c0b0..0189b88 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,7 @@ AC_SUBST(GNOTE_VERSION)
- dnl all the library version.
- dnl if one is harcoded elsewhere, it is a bug
- 
--GTK_VERSION=2.12
-+GTK_VERSION=2.18
- LIBGLIBMM_VERSION=2.0
- LIBGTKMM_VERSION=2.12.0
- LIBGCONF_VERSION=2.0.0
-diff --git a/libtomboy/tomboyutil.c b/libtomboy/tomboyutil.c
-index 162e4a2..9de7e62 100644
---- a/libtomboy/tomboyutil.c
-+++ b/libtomboy/tomboyutil.c
-@@ -153,9 +153,9 @@ tomboy_window_override_user_time (GtkWindow *window)
- void
- tomboy_window_present_hardcore (GtkWindow *window)
- {
--	if (!GTK_WIDGET_REALIZED (window))
-+	if (!gtk_widget_get_realized (GTK_WIDGET (window)))
- 		gtk_widget_realize (GTK_WIDGET (window));
--	else if (GTK_WIDGET_VISIBLE (window))
-+	else if (gtk_widget_get_visible (GTK_WIDGET (window)))
- 		tomboy_window_move_to_current_workspace (window);
- 
- 	tomboy_window_override_user_time (window);
---
-cgit v0.8.3.1
diff --git a/community/llvm/PKGBUILD b/community/llvm/PKGBUILD
deleted file mode 100644
index ad8dc556b..000000000
--- a/community/llvm/PKGBUILD
+++ /dev/null
@@ -1,225 +0,0 @@
-# $Id: PKGBUILD 44752 2011-04-11 14:36:48Z foutrelis $
-# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Sebastian Nowicki <sebnow@gmail.com>
-# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk>
-# Contributor: Roberto Alsina <ralsina@kde.org>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-
-pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
-pkgver=2.9
-_gcc_ver=4.6.0
-pkgrel=4
-arch=('i686' 'x86_64' 'mips64el')
-url="http://llvm.org/"
-license=('custom:University of Illinois/NCSA Open Source License')
-makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver")
-source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz
-        http://llvm.org/releases/$pkgver/clang-$pkgver.tgz
-        ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz
-        clang-plugin-loader-registry.patch
-        cindexer-clang-path.patch
-        clang-toolchains-gcc-versions.patch
-        clang-pure64.patch
-        enable-lto.patch)
-md5sums=('793138412d2af2c7c7f54615f8943771'
-         '634de18d04b7a4ded19ec4c17d23cfca'
-         '70e23a3dc2b38ecb2bb4d2c48f47295d'
-         '02c23b4aaca3445b8bf39fddb2f9906e'
-         '87a7162dbe99e9ffce6c40bd09f5f4f0'
-         '8da236120a9a287a977b575b8b905c93'
-         '225ee6b531f8327f34f344a18cb4ec81'
-         '8f7582d7440e4a8342c3aea9ec714fb4')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # At the present, clang must reside inside the LLVM source code tree to build
-  # See http://llvm.org/bugs/show_bug.cgi?id=4840
-  rm -rf tools/clang
-  cp -r "$srcdir/clang-$pkgver" tools/clang
-
-  # Fix symbolic links from OCaml bindings to LLVM libraries
-  sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml
-
-  # Fix installation directories, ./configure doesn't seem to set them right
-  sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \
-         -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \
-         -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
-    Makefile.config.in
-
-  # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
-  sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
-
-  # Get the correct list of symbols to export
-  # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html
-  patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch"
-
-  # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799)
-  patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch"
-
-  # Add GCC 4.6.0 to GccVersions (FS#23631)
-  patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch"
-
-  if [[ $CARCH == x86_64 ]]; then
-    # Adjust lib paths
-    patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch"
-  fi
-
-  # Make -flto work
-  # Use gold instead of default linker, and always use the plugin
-  patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch"
-
-  # Apply strip option to configure
-  _optimized_switch="enable"
-  [[ $(check_option strip) == n ]] && _optimized_switch="disable"
-
-  # Include location of libffi headers in CPPFLAGS
-  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
-
-  # TODO: Uncomment when clang works with GCC 4.6+
-  #_cxx_headers="/usr/include/c++/$_gcc_ver"
-  #if [[ ! -d $_cxx_headers ]]; then
-  #  error "Couldn't find the C++ headers, PKGBUILD needs fixing!"
-  #  return 1
-  #fi
-  _cxx_headers="/usr/include/c++/clang-$pkgver"
-
-  _32bit_headers=""
-  if [[ $CARCH == x86_64 ]]; then
-    # Important for multilib
-    _32bit_headers="32"
-  fi
-
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib/llvm \
-    --sysconfdir=/etc \
-    --enable-shared \
-    --enable-libffi \
-    --enable-targets=all \
-    --disable-expensive-checks \
-    --disable-debug-runtime \
-    --disable-assertions \
-    --with-binutils-include=/usr/include \
-    --with-cxx-include-root=$_cxx_headers \
-    --with-cxx-include-arch=$CHOST \
-    --with-cxx-include-32bit-dir=$_32bit_headers \
-    --$_optimized_switch-optimized
-
-  make REQUIRES_RTTI=1
-}
-
-package_llvm() {
-  pkgdesc="Low Level Virtual Machine"
-  depends=('perl' 'libffi')
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # We move the clang directory out of the tree so it won't get installed and
-  # then we bring it back in for the clang package
-  mv tools/clang "$srcdir"
-  # -j1 is due to race conditions during the installation of the OCaml bindings
-  make -j1 DESTDIR="$pkgdir" install
-  mv "$srcdir/clang" tools
-
-  # OCaml bindings go to a separate package
-  rm -rf "$srcdir"/{ocaml,ocamldoc}
-  mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir"
-
-  # Remove duplicate files installed by the OCaml bindings
-  rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz}
-
-  # Fix permissions of static libs
-  chmod -x "$pkgdir"/usr/lib/llvm/*.a
-
-  # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487)
-  sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config"
-
-  # Get rid of example Hello transformation
-  rm "$pkgdir"/usr/lib/llvm/*LLVMHello.*
-
-  # Symlink the gold plugin where clang expects it
-  ln -s llvm/LLVMgold.so "$pkgdir/usr/lib/LLVMgold.so"
-
-  # Add ld.so.conf.d entry
-  install -d "$pkgdir/etc/ld.so.conf.d"
-  echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_llvm-ocaml() {
-  pkgdesc="OCaml bindings for LLVM"
-  depends=("llvm=$pkgver-$pkgrel" 'ocaml')
-
-  cd "$srcdir/llvm-$pkgver"
-
-  install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm}
-  cp -r "$srcdir/ocaml" "$pkgdir/usr/lib"
-  cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm"
-
-  # Remove execute bit from static libraries
-  chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE"
-}
-
-package_clang() {
-  pkgdesc="C language family frontend for LLVM"
-  url="http://clang.llvm.org/"
-  # It looks like clang still needs GCC to assemble and link object files
-  # See http://old.nabble.com/%22clang--v%22-shows-a-GCC-call-td28378453.html
-  depends=("llvm=$pkgver-$pkgrel" "gcc=$_gcc_ver")
-
-  # Fix installation path for clang docs
-  sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \
-    "$srcdir/llvm-$pkgver/Makefile.config"
-
-  cd "$srcdir/llvm-$pkgver/tools/clang"
-  make DESTDIR="$pkgdir" install
-
-  # Fix permissions of static libs
-  chmod -x "$pkgdir"/usr/lib/llvm/*.a
-
-  # Revert the path change in case we want to do a repackage later
-  sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \
-    "$srcdir/llvm-$pkgver/Makefile.config"
-
-  # Install old libstdc++ headers. Contains combined headers from
-  # gcc 4.5.2-6-i686 and gcc-multilib-4.5.2-6-x86_64
-  install -d "$pkgdir/usr/include/c++"
-  cp -rd "$srcdir/gcc-headers-4.5.2" "$pkgdir/usr/include/c++/clang-$pkgver"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE"
-}
-
-package_clang-analyzer() {
-  pkgdesc="A source code analysis framework"
-  url="http://clang-analyzer.llvm.org/"
-  depends=("clang=$pkgver-$pkgrel" 'python2')
-
-  cd "$srcdir/llvm-$pkgver/tools/clang"
-
-  install -d "$pkgdir"/usr/{bin,lib/clang-analyzer}
-  for _tool in scan-{build,view}; do
-    cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/"
-    ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/"
-  done
-
-  # Use Python 2
-  sed -i 's/env python$/\02/' \
-    "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \
-    "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer"
-
-  # Compile Python scripts
-  python2 -m compileall "$pkgdir/usr/lib/clang-analyzer"
-  python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/llvm/cindexer-clang-path.patch b/community/llvm/cindexer-clang-path.patch
deleted file mode 100644
index ddaab690e..000000000
--- a/community/llvm/cindexer-clang-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/libclang/CIndexer.cpp.orig	2011-04-07 13:08:24.000000000 +0300
-+++ tools/libclang/CIndexer.cpp	2011-04-07 13:11:52.224884642 +0300
-@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP
-   
-   // We now have the CIndex directory, locate clang relative to it.
-   LibClangPath.eraseComponent();
-+  LibClangPath.eraseComponent();
- #endif
-   
-   LibClangPath.appendComponent("clang");
diff --git a/community/llvm/clang-plugin-loader-registry.patch b/community/llvm/clang-plugin-loader-registry.patch
deleted file mode 100644
index f46eb9fce..000000000
--- a/community/llvm/clang-plugin-loader-registry.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map
---- llvm-2.7.orig/autoconf/ExportMap.map	2010-02-25 00:33:41.000000000 +0200
-+++ llvm-2.7/autoconf/ExportMap.map	2010-05-10 14:14:22.000000000 +0300
-@@ -2,6 +2,7 @@
- 	global: main;
- 		__progname;
- 		environ;
-+		_ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE;
- 
- 	local: *;
- };
diff --git a/community/llvm/clang-pure64.patch b/community/llvm/clang-pure64.patch
deleted file mode 100644
index da6178519..000000000
--- a/community/llvm/clang-pure64.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp	(revision 123373)
-+++ lib/Driver/Tools.cpp	(working copy)
-@@ -3306,7 +3306,7 @@
-     else if (ToolChain.getArch() == llvm::Triple::arm)
-       CmdArgs.push_back("/lib/ld-linux.so.3");
-     else
--      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
-+      CmdArgs.push_back("/lib/ld-linux-x86-64.so.2");
-   }
- 
-   CmdArgs.push_back("-o");
-Index: lib/Driver/ToolChains.cpp
-===================================================================
---- lib/Driver/ToolChains.cpp	(revision 123373)
-+++ lib/Driver/ToolChains.cpp	(working copy)
-@@ -1317,18 +1317,10 @@
-   if (Arch == llvm::Triple::x86)
-     Suffix64 = "/64";
- 
--  std::string Lib32 = "lib";
--
--  bool Exists;
--  if (!llvm::sys::fs::exists("/lib32", Exists) && Exists)
--    Lib32 = "lib32";
--
-+  std::string Lib32 = "lib32";
-   std::string Lib64 = "lib";
--  bool Symlink;
--  if (!llvm::sys::fs::exists("/lib64", Exists) && Exists &&
--      (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink))
--    Lib64 = "lib64";
- 
-+  bool Exists;
-   std::string GccTriple = "";
-   if (Arch == llvm::Triple::arm) {
-     if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) &&
diff --git a/community/llvm/clang-toolchains-gcc-versions.patch b/community/llvm/clang-toolchains-gcc-versions.patch
deleted file mode 100644
index 2e527300d..000000000
--- a/community/llvm/clang-toolchains-gcc-versions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp
---- clang-2.9.orig/lib/Driver/ToolChains.cpp	2011-03-21 23:29:27.000000000 +0200
-+++ clang-2.9/lib/Driver/ToolChains.cpp	2011-04-08 00:03:34.000000000 +0300
-@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const
-       GccTriple = "i586-suse-linux";
-   }
- 
--  const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
-+  const char* GccVersions[] = {"4.6.0", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
-                                "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2",
-                                "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1",
-                                "4.2"};
diff --git a/community/llvm/enable-lto.patch b/community/llvm/enable-lto.patch
deleted file mode 100644
index 40d93104a..000000000
--- a/community/llvm/enable-lto.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: lib/Driver/ToolChains.cpp
-===================================================================
---- lib/Driver/ToolChains.cpp	(revision 123373)
-+++ lib/Driver/ToolChains.cpp	(working copy)
-@@ -1398,11 +1398,11 @@
-     Lib = Lib64;
-   }
- 
--  llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld");
-+  llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold");
-   if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists)
-     Linker = LinkerPath.str();
-   else
--    Linker = GetProgramPath("ld");
-+    Linker = GetProgramPath("ld.gold");
- 
-   LinuxDistro Distro = DetectLinuxDistro(Arch);
- 
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp	(revision 123373)
-+++ lib/Driver/Tools.cpp	(working copy)
-@@ -3412,11 +3412,11 @@
-     }
-   }
- 
--  if (Args.hasArg(options::OPT_use_gold_plugin)) {
-+  // if (Args.hasArg(options::OPT_use_gold_plugin)) {
-     CmdArgs.push_back("-plugin");
-     std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
-     CmdArgs.push_back(Args.MakeArgString(Plugin));
--  }
-+  // }
- 
-   C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs));
- }
diff --git a/community/xonotic/PKGBUILD b/community/xonotic/PKGBUILD
deleted file mode 100644
index 1d91f228d..000000000
--- a/community/xonotic/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Alexander Suhoverhov <cy at ngs dot ru>
-pkgname=xonotic
-pkgver=0.1.0
-pkgrel=2
-pkgdesc="A free, fast-paced crossplatform first-person shooter"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://xonotic.org"
-license=('GPL')
-depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'sdl' 'libpng>=1.4.0' 'xonotic-data')
-makedepends=('unzip' 'mesa')
-source=('http://dl.xonotic.org/xonotic-0.1.0preview.zip'
-        'xonotic-dedicated.sh'
-        'xonotic-glx.sh'
-        'xonotic-sdl.sh'
-        'xonotic-glx.desktop'
-        'xonotic-sdl.desktop')
-md5sums=('aafb43893aa66e01488c817e3a60d96d'
-        '2c0aef8104fa34aef58d368d994abca3'
-        'd2f357eab92db585448476470bbf9c1c'
-        'fdb9b96cd2b700ea9e8a7d6a1ab3505e'
-        '914c7b9163e92b35f0ab57fdb1653ac5'
-        'da7d812ff231c9332cd694b39757adda')
-
-build() {
-	# le compiling
-	cd $srcdir/Xonotic/source/darkplaces
-
-	# build the binaries separately instead to avoid truncated files
-	make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 cl-nexuiz
-	make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sdl-nexuiz
-	make CPUOPTIMIZATIONS="${CFLAGS}" DP_LINK_TO_LIBJPEG=1 sv-nexuiz
-}
-
-package() {
-	cd $srcdir/Xonotic
-
-	# binaries
-	install -Dm755 source/darkplaces/nexuiz-dedicated $pkgdir/opt/xonotic/xonotic-dedicated
-	install -Dm755 source/darkplaces/nexuiz-glx $pkgdir/opt/xonotic/xonotic-glx
-	install -Dm755 source/darkplaces/nexuiz-sdl $pkgdir/opt/xonotic/xonotic-sdl
-
-	# convenience files
-	mkdir -p $pkgdir/usr/share/applications
-	install -Dm644 $srcdir/*.desktop -t $pkgdir/usr/share/applications
-	install -Dm755 $srcdir/xonotic-dedicated.sh $pkgdir/usr/bin/xonotic-dedicated
-	install -Dm755 $srcdir/xonotic-glx.sh $pkgdir/usr/bin/xonotic-glx
-	install -Dm755 $srcdir/xonotic-sdl.sh $pkgdir/usr/bin/xonotic-sdl
-	install -Dm644 $srcdir/Xonotic/misc/logos/icons_png/xonotic_512.png $pkgdir/usr/share/pixmaps/xonotic.png
-}
-
-# vim: ts=2:sw=2 et:
diff --git a/community/xonotic/xonotic-dedicated.sh b/community/xonotic/xonotic-dedicated.sh
deleted file mode 100644
index b9998ca3c..000000000
--- a/community/xonotic/xonotic-dedicated.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/xonotic
-./xonotic-dedicated $@
diff --git a/community/xonotic/xonotic-glx.desktop b/community/xonotic/xonotic-glx.desktop
deleted file mode 100644
index 9f9e78cc1..000000000
--- a/community/xonotic/xonotic-glx.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=2.5
-Encoding=UTF-8
-Name=Xonotic (GLX)
-Comment=a free open-source first person shooter
-Icon=/usr/share/pixmaps/xonotic.png
-Exec=/usr/bin/xonotic-glx
-Terminal=false
-StartupNotify=false
-Categories=Game;
diff --git a/community/xonotic/xonotic-glx.sh b/community/xonotic/xonotic-glx.sh
deleted file mode 100644
index e52a99c9f..000000000
--- a/community/xonotic/xonotic-glx.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/xonotic
-./xonotic-glx $@
diff --git a/community/xonotic/xonotic-sdl.desktop b/community/xonotic/xonotic-sdl.desktop
deleted file mode 100644
index 32b37f2c5..000000000
--- a/community/xonotic/xonotic-sdl.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=2.5
-Encoding=UTF-8
-Name=Xonotic (SDL)
-Comment=a free open-source first person shooter
-Icon=/usr/share/pixmaps/xonotic.png
-Exec=/usr/bin/xonotic-sdl
-Terminal=false
-StartupNotify=false
-Categories=Game;
diff --git a/community/xonotic/xonotic-sdl.sh b/community/xonotic/xonotic-sdl.sh
deleted file mode 100644
index 976d3ccf5..000000000
--- a/community/xonotic/xonotic-sdl.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/xonotic
-./xonotic-sdl $@
diff --git a/community/yajl/handle-null-case.patch b/community/yajl/handle-null-case.patch
deleted file mode 100644
index 923e23961..000000000
--- a/community/yajl/handle-null-case.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 615924b7bf68791c166149a9f76bec740dacefd6 Mon Sep 17 00:00:00 2001
-From: Lloyd Hilaiel <lloyd@hilaiel.com>
-Date: Tue, 26 Apr 2011 09:47:13 -0600
-Subject: [PATCH] crash fix, handle the case where yajl_alloc() is followed by
- yajl_complete_parse() without a call to yajl_parse() in the
- middle.  closes #27.
-
----
- src/yajl.c        |   18 +++++++++++++++---
- src/yajl_parser.c |    2 +-
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/src/yajl.c b/src/yajl.c
-index 793eea3..293e545 100644
---- a/src/yajl.c
-+++ b/src/yajl.c
-@@ -49,7 +49,7 @@ yajl_alloc(const yajl_callbacks * callbacks,
- {
-     yajl_handle hand = NULL;
-     yajl_alloc_funcs afsBuffer;
--    
-+
-     /* first order of business is to set up memory allocation routines */
-     if (afs != NULL) {
-         if (afs->malloc == NULL || afs->realloc == NULL || afs->free == NULL)
-@@ -73,7 +73,7 @@ yajl_alloc(const yajl_callbacks * callbacks,
-     hand->decodeBuf = yajl_buf_alloc(&(hand->alloc));
-     hand->flags	    = 0;
-     yajl_bs_init(hand->stateStack, &(hand->alloc));
--    yajl_bs_push(hand->stateStack, yajl_state_start);    
-+    yajl_bs_push(hand->stateStack, yajl_state_start);
- 
-     return hand;
- }
-@@ -120,7 +120,7 @@ yajl_parse(yajl_handle hand, const unsigned char * jsonText,
- {
-     yajl_status status;
- 
--    // lazy allocate the lexer
-+    /* lazy allocation of the lexer */
-     if (hand->lexer == NULL) {
-         hand->lexer = yajl_lex_alloc(&(hand->alloc),
-                                      hand->flags & yajl_allow_comments,
-@@ -135,6 +135,18 @@ yajl_parse(yajl_handle hand, const unsigned char * jsonText,
- yajl_status
- yajl_complete_parse(yajl_handle hand)
- {
-+    /* The lexer is lazy allocated in the first call to parse.  if parse is
-+     * never called, then no data was provided to parse at all.  This is a
-+     * "premature EOF" error unless yajl_allow_partial_values is specified.
-+     * allocating the lexer now is the simplest possible way to handle this
-+     * case while preserving all the other semantics of the parser
-+     * (multiple values, partial values, etc). */
-+    if (hand->lexer == NULL) {
-+        hand->lexer = yajl_lex_alloc(&(hand->alloc),
-+                                     hand->flags & yajl_allow_comments,
-+                                     !(hand->flags & yajl_dont_validate_strings));
-+    }
-+
-     return yajl_do_finish(hand);
- }
- 
-diff --git a/src/yajl_parser.c b/src/yajl_parser.c
-index 20d73bf..3903b38 100644
---- a/src/yajl_parser.c
-+++ b/src/yajl_parser.c
-@@ -155,7 +155,7 @@ yajl_status
- yajl_do_finish(yajl_handle hand)
- {
-     yajl_status stat;
--    stat = yajl_do_parse(hand,(const unsigned char *)" ",1);
-+    stat = yajl_do_parse(hand,(const unsigned char *) " ",1);
- 
-     if (stat != yajl_status_ok) return stat;
- 
--- 
-1.7.4.4
-
diff --git a/extra/clutter-gtk/fix-gir.patch b/extra/clutter-gtk/fix-gir.patch
deleted file mode 100644
index 54935aea2..000000000
--- a/extra/clutter-gtk/fix-gir.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 4de105a2bbd201c8e60f3e8777794a4cd532afdc Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@linux.intel.com>
-Date: Tue, 28 Sep 2010 13:52:25 +0000
-Subject: build: Add common CFLAGS to the introspection scanner
-
----
-diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
-index 6e267b4..cec5cce 100644
---- a/clutter-gtk/Makefile.am
-+++ b/clutter-gtk/Makefile.am
-@@ -15,6 +15,8 @@ AM_CPPFLAGS = \
- 	-DCLUTTER_DISABLE_DEPRECATED		\
- 	$(CLUTTER_GTK_DEBUG_CFLAGS)
- 
-+common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
-+
- # please, keep these lists sorted alphabetically
- sources_c = \
- 	$(srcdir)/gtk-clutter-embed.c 		\
-@@ -36,7 +38,7 @@ lib_LTLIBRARIES = libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
- libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
- libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
- libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
--libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS) 
-+libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS)
- 
- cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk
- cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h
-@@ -48,7 +50,7 @@ GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libc
- 	$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
- 		--namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
- 		--strip-prefix=GtkClutter \
--		$(INCLUDES) $(AM_CPPFLAGS) \
-+		$(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \
- 		--add-include-path=$(srcdir) --add-include=path=. \
- 		--include=Clutter-1.0 \
- 		--include=GdkPixbuf-2.0 \
---
-cgit v0.8.3.1-30-gff3a
-From 0d77c7c965dcebcec0dae6b6244c3a057b398b59 Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@linux.intel.com>
-Date: Tue, 28 Sep 2010 13:58:17 +0000
-Subject: Add introspection annotations for gtk_clutter_init*
-
----
-diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c
-index 8cf4116..50bca6b 100644
---- a/clutter-gtk/gtk-clutter-util.c
-+++ b/clutter-gtk/gtk-clutter-util.c
-@@ -603,8 +603,9 @@ gtk_clutter_texture_set_from_icon_name (ClutterTexture *texture,
- 
- /**
-  * gtk_clutter_init:
-- * @argc: pointer to the arguments count, or %NULL
-- * @argv: pointer to the arguments vector, or %NULL
-+ * @argc: (inout): pointer to the arguments count, or %NULL
-+ * @argv: (array length=argc) (inout) (allow-none): pointer to the
-+ *   arguments vector, or %NULL
-  *
-  * This function should be called instead of clutter_init() and
-  * gtk_init().
-@@ -633,17 +634,18 @@ gtk_clutter_init (int    *argc,
- 
- /**
-  * gtk_clutter_init_with_args:
-- * @argc: a pointer to the number of command line arguments.
-- * @argv: a pointer to the array of command line arguments.
-- * @parameter_string: a string which is displayed in
-- *    the first line of <option>--help</option> output, after
-- *    <literal><replaceable>programname</replaceable> [OPTION...]</literal>
-- * @entries: a %NULL-terminated array of #GOptionEntry<!-- -->s
-- *    describing the options of your program
-- * @translation_domain: a translation domain to use for translating
-- *    the <option>--help</option> output for the options in @entries
-- *    with gettext(), or %NULL
-- * @error: a return location for errors
-+ * @argc: (inout): a pointer to the number of command line arguments.
-+ * @argv: (array length=argc) (inout) (allow-none): a pointer to the array
-+ *   of command line arguments.
-+ * @parameter_string: (allow-none): a string which is displayed in
-+ *   the first line of <option>--help</option> output, after
-+ *   <literal><replaceable>programname</replaceable> [OPTION...]</literal>
-+ * @entries: (allow-none): a %NULL-terminated array of #GOptionEntry<!-- -->s
-+ *   describing the options of your program, or %NULL
-+ * @translation_domain: (allow-none): a translation domain to use for
-+ *   translating the <option>--help</option> output for the options
-+ *   in @entries with gettext(), or %NULL
-+ * @error: (allow-none): a return location for errors, or %NULL
-  *
-  * This function should be called instead of clutter_init() and
-  * gtk_init_with_args().
---
-cgit v0.8.3.1-30-gff3a
diff --git a/extra/ekiga/ekiga-3.2.7-libnotify-0.7.patch b/extra/ekiga/ekiga-3.2.7-libnotify-0.7.patch
deleted file mode 100644
index c09fbb0f9..000000000
--- a/extra/ekiga/ekiga-3.2.7-libnotify-0.7.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- lib/engine/components/libnotify/libnotify-main.cpp
-+++ lib/engine/components/libnotify/libnotify-main.cpp
-@@ -40,6 +40,10 @@
- 
- #include <libnotify/notify.h>
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- #include "services.h"
- #include "notification-core.h"
- 
-@@ -158,7 +162,12 @@
- 
-   notif = notify_notification_new (notification->get_title ().c_str (),
- 				   notification->get_body ().c_str (),
--				   urgency, NULL);
-+				   urgency
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+				   );
-+#else
-+				   , NULL);
-+#endif
- 
-   g_signal_connect (notif, "closed",
- 		    G_CALLBACK (on_notif_closed), notification.get ());
---- src/gui/main.cpp
-+++ src/gui/main.cpp
-@@ -84,6 +84,9 @@
- 
- #ifdef HAVE_NOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- #if defined(P_FREEBSD) || defined (P_MACOSX)
-@@ -2820,12 +2823,21 @@
- 
-   body = g_strdup_printf ("%s\n%s\n%s", uri, app, account);
-   
--  notify = notify_notification_new (title, body, GM_ICON_LOGO, NULL);
-+  notify = notify_notification_new (title, body, GM_ICON_LOGO
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+  );
-+#else
-+  , NULL);
-+#endif
-   notify_notification_add_action (notify, "accept", _("Accept"), notify_action_cb, mw, NULL);
-   notify_notification_add_action (notify, "reject", _("Reject"), notify_action_cb, mw, NULL);
-   notify_notification_set_timeout (notify, NOTIFY_EXPIRES_NEVER);
-   notify_notification_set_urgency (notify, NOTIFY_URGENCY_CRITICAL);
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+  // notify_notification_attach_to_status_icon was removed
-+#else
-   notify_notification_attach_to_status_icon (notify, statusicon);
-+#endif
-   if (!notify_notification_show (notify, NULL)) {
-     ekiga_main_window_incoming_call_dialog_show (mw, call);
-   }
diff --git a/extra/empathy/empathy-2.32.2-libnotify-0.7.patch b/extra/empathy/empathy-2.32.2-libnotify-0.7.patch
deleted file mode 100644
index b430ff269..000000000
--- a/extra/empathy/empathy-2.32.2-libnotify-0.7.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/empathy-chat-window.c
-+++ src/empathy-chat-window.c
-@@ -35,6 +35,11 @@
- #include <gdk/gdkx.h>
- #include <glib/gi18n.h>
- #include <libnotify/notification.h>
-+#include <libnotify/notify.h>
-+
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- 
- #include <telepathy-glib/telepathy-glib.h>
- 
-@@ -1300,7 +1305,12 @@
- 		   to an existing notification with the same title.
- 		   In this way the previous message will not be lost: the new
- 		   message will appear below it, in the same notification */
--		notification = notify_notification_new (header, escaped, NULL, NULL);
-+		notification = notify_notification_new (header, escaped, NULL
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+		);
-+#else
-+		, NULL);
-+#endif
- 
- 		if (priv->notification == NULL) {
- 			priv->notification = notification;
---- src/empathy-status-icon.c
-+++ src/empathy-status-icon.c
-@@ -32,6 +32,10 @@
- #include <libnotify/notification.h>
- #include <libnotify/notify.h>
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- #include <telepathy-glib/account-manager.h>
- #include <telepathy-glib/util.h>
- 
-@@ -206,8 +210,12 @@
- 			   to an existing notification with the same title.
- 			   In this way the previous message will not be lost: the new
- 			   message will appear below it, in the same notification */
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+			/* notify_notification_new_with_status_icon was removed */
-+#else
- 			notification = notify_notification_new_with_status_icon
- 				(priv->event->header, message_esc, NULL, priv->icon);
-+#endif
- 
- 			if (priv->notification == NULL) {
- 				priv->notification = notification;
diff --git a/extra/epiphany/add-dbus-glib.patch b/extra/epiphany/add-dbus-glib.patch
deleted file mode 100644
index c50be67a2..000000000
--- a/extra/epiphany/add-dbus-glib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 174a51819570a975cc61e642f7f26cb4bc2f9c57 Mon Sep 17 00:00:00 2001
-From: Diego Escalante Urrelo <descalante@igalia.com>
-Date: Mon, 01 Nov 2010 05:56:51 +0000
-Subject: tests: DBUS_LIBS is needed for libephymain.la
-
----
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index bd2c378..b973214 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -23,6 +23,7 @@ LDADD = \
- 	$(top_builddir)/lib/widgets/libephywidgets.la \
- 	$(top_builddir)/lib/libephymisc.la \
- 	$(top_builddir)/lib/egg/libegg.la \
-+	$(DBUS_LIBS) \
- 	$(DEPENDENCIES_LIBS) 
- 
- if ENABLE_NSS
---
-cgit v0.8.3.4
diff --git a/extra/epiphany/epiphany-2.30.6-libnotify-0.7.patch b/extra/epiphany/epiphany-2.30.6-libnotify-0.7.patch
deleted file mode 100644
index a0c5f8ee1..000000000
--- a/extra/epiphany/epiphany-2.30.6-libnotify-0.7.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- embed/downloader-view.c
-+++ embed/downloader-view.c
-@@ -36,6 +36,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- enum
-@@ -337,7 +340,12 @@
- 	g_object_ref (dv);
- 
- 	notification = notify_notification_new (title, msg,
--						GTK_STOCK_INFO, NULL);
-+						GTK_STOCK_INFO
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+						);
-+#else
-+						, NULL);
-+#endif
- 
- 	g_signal_connect_after (notification, "closed",
- 				G_CALLBACK (notification_closed_cb), dv);
-@@ -346,7 +354,11 @@
- 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
- 	notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
- 
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+	/* notify_notification_attach_to_status_icon was removed */
-+#else
- 	notify_notification_attach_to_status_icon (notification, status_icon);
-+#endif
- 
- 	/* There are some visual glitches when the notification is shown and
- 	 * the GtkStatusIcon is still not visible. To avoid that, we delay the
diff --git a/extra/epiphany/fix-introspection.patch b/extra/epiphany/fix-introspection.patch
deleted file mode 100644
index 4d8dca923..000000000
--- a/extra/epiphany/fix-introspection.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 78b9eac0fca36e27c83c7678b18962ba286f041b Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Fri, 01 Oct 2010 16:36:23 +0000
-Subject: introspection: Fix build by telling g-ir-scanner what the prefix is
-
-https://bugzilla.gnome.org/show_bug.cgi?id=631119
----
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e9d3715..acbf8ff 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -350,6 +350,7 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILE
- 		--include=WebKit-1.0 \
- 		--program=./epiphany \
- 		--output $@ \
-+		--strip-prefix=Ephy \
- 		--pkg epiphany-$(EPIPHANY_API_VERSION) \
- 		-DEPIPHANY_COMPILATION \
- 		-I$(top_srcdir)/embed \
---
-cgit v0.8.3.1
diff --git a/extra/evince/security_issues_in_dvi-backend.patch b/extra/evince/security_issues_in_dvi-backend.patch
deleted file mode 100644
index 691ee4190..000000000
--- a/extra/evince/security_issues_in_dvi-backend.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 8e473c9796b9a61b811213e7892fd36fd570303a Mon Sep 17 00:00:00 2001
-From: José Aliste <jaliste@src.gnome.org>
-Date: Tue, 07 Dec 2010 18:56:47 +0000
-Subject: backends: Fix several security issues in the dvi-backend.
-
-See CVE-2010-2640, CVE-2010-2641, CVE-2010-2642 and  CVE-2010-2643.
----
-diff --git a/backend/dvi/mdvi-lib/afmparse.c b/backend/dvi/mdvi-lib/afmparse.c
-index 164366b..361e23d 100644
---- a/backend/dvi/mdvi-lib/afmparse.c
-+++ b/backend/dvi/mdvi-lib/afmparse.c
-@@ -160,7 +160,7 @@ static char *token(FILE *stream)
-     
-     idx = 0;
-     while (ch != EOF && ch != ' ' && ch != lineterm 
--           && ch != '\t' && ch != ':' && ch != ';') 
-+           && ch != '\t' && ch != ':' && ch != ';' && idx < MAX_NAME)
-     {
-         ident[idx++] = ch;
-         ch = fgetc(stream);
-diff --git a/backend/dvi/mdvi-lib/dviread.c b/backend/dvi/mdvi-lib/dviread.c
-index 97b7b84..ac98068 100644
---- a/backend/dvi/mdvi-lib/dviread.c
-+++ b/backend/dvi/mdvi-lib/dviread.c
-@@ -1537,6 +1537,10 @@ int	special(DviContext *dvi, int opcode)
- 	Int32	arg;
- 	
- 	arg = dugetn(dvi, opcode - DVI_XXX1 + 1);
-+	if (arg <= 0) {
-+		dvierr(dvi, _("malformed special length\n"));
-+		return -1;
-+	}
- 	s = mdvi_malloc(arg + 1);
- 	dread(dvi, s, arg);
- 	s[arg] = 0;
-diff --git a/backend/dvi/mdvi-lib/pk.c b/backend/dvi/mdvi-lib/pk.c
-index a579186..08377e6 100644
---- a/backend/dvi/mdvi-lib/pk.c
-+++ b/backend/dvi/mdvi-lib/pk.c
-@@ -469,6 +469,15 @@ static int pk_load_font(DviParams *unused, DviFont *font)
- 			}
- 			if(feof(p))
- 				break;
-+
-+			/* Although the PK format support bigger char codes,
-+                         * XeTeX and other extended TeX engines support charcodes up to
-+                         * 65536, while normal TeX engine supports only charcode up to 255.*/
-+			if (cc < 0 || cc > 65536) {
-+				mdvi_error (_("%s: unexpected charcode (%d)\n"),
-+					    font->fontname,cc);
-+				goto error;
-+			} 
- 			if(cc < loc)
- 				loc = cc;
- 			if(cc > hic)
-@@ -512,7 +521,7 @@ static int pk_load_font(DviParams *unused, DviFont *font)
- 	}
- 
- 	/* resize font char data */
--	if(loc > 0 || hic < maxch-1) {
-+	if(loc > 0 && hic < maxch-1) {
- 		memmove(font->chars, font->chars + loc, 
- 			(hic - loc + 1) * sizeof(DviFontChar));
- 		font->chars = xresize(font->chars,
-diff --git a/backend/dvi/mdvi-lib/tfmfile.c b/backend/dvi/mdvi-lib/tfmfile.c
-index 73ebf26..8c2a30b 100644
---- a/backend/dvi/mdvi-lib/tfmfile.c
-+++ b/backend/dvi/mdvi-lib/tfmfile.c
-@@ -172,7 +172,8 @@ int	tfm_load_file(const char *filename, TFMInfo *info)
- 	/* We read the entire TFM file into core */
- 	if(fstat(fileno(in), &st) < 0)
- 		return -1;
--	if(st.st_size == 0)
-+	/* according to the spec, TFM files are smaller than 16K */
-+	if(st.st_size == 0 || st.st_size >= 16384)
- 		goto bad_tfm;
- 
- 	/* allocate a word-aligned buffer to hold the file */
-diff --git a/backend/dvi/mdvi-lib/vf.c b/backend/dvi/mdvi-lib/vf.c
-index fb49847..a5ae3bb 100644
---- a/backend/dvi/mdvi-lib/vf.c
-+++ b/backend/dvi/mdvi-lib/vf.c
-@@ -165,6 +165,12 @@ static int vf_load_font(DviParams *params, DviFont *font)
- 			cc = fuget1(p);
- 			tfm = fuget3(p);
- 		}
-+		if (cc < 0 || cc > 65536) {
-+			/* TeX engines do not support char codes bigger than 65535 */
-+			mdvi_error(_("(vf) %s: unexpected character %d\n"),
-+				   font->fontname, cc);
-+			goto error;
-+		}
- 		if(loc < 0 || cc < loc)
- 			loc = cc;
- 		if(hic < 0 || cc > hic)
---
-cgit v0.8.3.1
diff --git a/extra/evince/update_to_poppler_api.patch b/extra/evince/update_to_poppler_api.patch
deleted file mode 100644
index 29bcad6b9..000000000
--- a/extra/evince/update_to_poppler_api.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From f77e6cf4fd7fef49ac91d8c62b6a9a993529adb8 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <carlosgc@gnome.org>
-Date: Fri, 17 Sep 2010 11:21:16 +0000
-Subject: [pdf] Update to poppler api changes
-
-Linearized PopplerDocument property is now boolean rather than string.
----
-diff --git a/backend/pdf/ev-poppler.cc b/backend/pdf/ev-poppler.cc
-index aa080e6..ced3ef7 100644
---- a/backend/pdf/ev-poppler.cc
-+++ b/backend/pdf/ev-poppler.cc
-@@ -722,6 +722,9 @@ pdf_document_get_info (EvDocument *document)
- 	PopplerPermissions permissions;
- 	EvPage *page;
- 	char *metadata;
-+#ifdef HAVE_POPPLER_DOCUMENT_IS_LINEARIZED
-+	gboolean linearized;
-+#endif
- 
- 	info = g_new0 (EvDocumentInfo, 1);
- 
-@@ -758,7 +761,11 @@ pdf_document_get_info (EvDocument *document)
- 		      "producer", &(info->producer),
- 		      "creation-date", &(info->creation_date),
- 		      "mod-date", &(info->modified_date),
-+#ifdef HAVE_POPPLER_DOCUMENT_IS_LINEARIZED
-+		      "linearized", &linearized,
-+#else
- 		      "linearized", &(info->linearized),
-+#endif
- 		      "metadata", &metadata,
- 		      NULL);
- 
-@@ -864,6 +871,10 @@ pdf_document_get_info (EvDocument *document)
- 		info->security = g_strdup (_("No"));
- 	}
- 
-+#ifdef HAVE_POPPLER_DOCUMENT_IS_LINEARIZED
-+	info->linearized = linearized ? g_strdup (_("Yes")) : g_strdup (_("No"));
-+#endif
-+
- 	return info;
- }
- 
-diff --git a/configure.ac b/configure.ac
-index 0faa16e..9619349 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -512,6 +512,7 @@ if test "x$enable_pdf" = "xyes"; then
- 	    AC_CHECK_FUNCS(poppler_page_get_text_layout)
- 	    AC_CHECK_FUNCS(poppler_page_get_selected_text)
- 	    AC_CHECK_FUNCS(poppler_page_add_annot)
-+	    AC_CHECK_FUNCS(poppler_document_is_linearized)
- 	    LIBS=$evince_save_LIBS
- 	    PKG_CHECK_MODULES(CAIRO_PDF, cairo-pdf, enable_cairo_pdf=yes, enable_cairo_pdf=no)
- 	    if test x$enable_cairo_pdf = xyes; then
---
-cgit v0.8.3.1
diff --git a/extra/evolution/evolution-2.32.1-libnotify-0.7.patch b/extra/evolution/evolution-2.32.1-libnotify-0.7.patch
deleted file mode 100644
index 7e2474b47..000000000
--- a/extra/evolution/evolution-2.32.1-libnotify-0.7.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- calendar/gui/alarm-notify/alarm-queue.c
-+++ calendar/gui/alarm-notify/alarm-queue.c
-@@ -40,6 +40,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- #include "alarm.h"
-@@ -1606,7 +1609,12 @@
- 			body = g_strdup_printf ("%s %s", start_str, time_str);
- 	}
- 
--	n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL);
-+	n = notify_notification_new (summary, body, "stock_appointment-reminder"
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+	);
-+#else
-+	, NULL);
-+#endif
- 	if (!notify_notification_show(n, NULL))
- 	    g_warning ("Could not send notification to daemon\n");
- 
---- plugins/mail-notification/mail-notification.c
-+++ plugins/mail-notification/mail-notification.c
-@@ -47,6 +47,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- #define GCONF_KEY_ROOT			"/apps/evolution/eplugin/mail-notification/"
-@@ -564,9 +567,14 @@
- 
- 			notify  = notify_notification_new (
- 				_("New email"), safetext,
--				"mail-unread", NULL);
-+				"mail-unread"
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+				);
-+#else
-+				, NULL);
- 			notify_notification_attach_to_status_icon (
- 				notify, status_icon);
-+#endif
- 
- 			/* Check if actions are supported */
- 			if (can_support_actions ()) {
---- plugins/publish-calendar/publish-calendar.c
-+++ plugins/publish-calendar/publish-calendar.c
-@@ -46,6 +46,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- static GtkListStore *store = NULL;
-@@ -150,8 +153,13 @@
- 				return;
- 			}
- 
--			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name, NULL);
-+			notify  = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+			);
-+#else
-+			, NULL);
- 			notify_notification_attach_to_status_icon (notify, status_icon);
-+#endif
- 			notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
- 			notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
- 			g_timeout_add (500, show_notify_cb, NULL);
diff --git a/extra/gdm/0001-port-to-libpanel-applet-3.0.patch b/extra/gdm/0001-port-to-libpanel-applet-3.0.patch
deleted file mode 100644
index 91ada7835..000000000
--- a/extra/gdm/0001-port-to-libpanel-applet-3.0.patch
+++ /dev/null
@@ -1,506 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ed07dce..bf98669 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -45,7 +45,7 @@ GTK_REQUIRED_VERSION=2.20.0
- PANGO_REQUIRED_VERSION=1.3.0
- SCROLLKEEPER_REQUIRED_VERSION=0.1.4
- GCONF_REQUIRED_VERSION=2.31.3
--GNOME_PANEL_REQUIRED_VERSION=2.0.0
-+GNOME_PANEL_REQUIRED_VERSION=2.31.90
- LIBXKLAVIER_REQUIRED_VERSION=4.0
- LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
- #FONTCONFIG_REQUIRED_VERSION=2.6.0
-@@ -152,7 +152,7 @@ AC_SUBST(SIMPLE_CHOOSER_LIBS)
- PKG_CHECK_MODULES(APPLET,
-         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
-         gtk+-2.0 >= $GTK_REQUIRED_VERSION
--        libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED_VERSION)
-+        libpanelapplet-3.0 >= $GNOME_PANEL_REQUIRED_VERSION)
- AC_SUBST(APPLET_CFLAGS)
- AC_SUBST(APPLET_LIBS)
- 
-diff --git a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
-deleted file mode 100644
-index a9b775f..0000000
---- a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
-+++ /dev/null
-@@ -1,38 +0,0 @@
--<oaf_info>
--  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe"
--              location="@LIBEXECDIR@/gdm-user-switch-applet">
--
--    <oaf_attribute name="repo_ids" type="stringv">
--      <item value="IDL:Bonobo/GenericFactory:1.0"/>
--      <item value="IDL:Bonobo/Unknown:1.0"/>
--    </oaf_attribute>
--    <oaf_attribute name="name" type="string" _value="User Switcher Applet Factory"/>
--    <oaf_attribute name="description" type="string" _value="User Switcher Applet Factory"/>
--    <oaf_attribute name="bonobo:environment" type="stringv">
--       <item value="DBUS_SESSION_BUS_ADDRESS"/>
--     <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
--     <oaf_attribute name="bugzilla:product" type="string" value="gdm"/>
--     <oaf_attribute name="bugzilla:component" type="string" value="general"/>
--     <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
--     <oaf_attribute name="bugzilla:other_binaries" type="string" value="gdm-user-switch-applet"/>
--    </oaf_attribute>
--  </oaf_server>
--
--  <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory"
--              location="OAFIID:GNOME_FastUserSwitchApplet_Factory">
--
--    <oaf_attribute name="repo_ids" type="stringv">
--      <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
--      <item value="IDL:Bonobo/Control:1.0"/>
--      <item value="IDL:Bonobo/Unknown:1.0"/>
--    </oaf_attribute>
--    <oaf_attribute name="name" type="string" _value="User Switcher"/>
--    <oaf_attribute name="description" type="string" _value="A menu to quickly switch between users"/>
--    <oaf_attribute name="panel:icon" type="string" value="stock_people"/>
--    <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
--    <oaf_attribute name="bugzilla:product" type="string" value="gdm"/>
--    <oaf_attribute name="bugzilla:component" type="string" value="general"/>
--    <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
--    <oaf_attribute name="bugzilla:other_binaries" type="string" value="gdm-user-switch-applet"/>
--  </oaf_server>
--</oaf_info>
-diff --git a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
-deleted file mode 100644
-index e1845c8..0000000
---- a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
-+++ /dev/null
-@@ -1,20 +0,0 @@
--<Root>
--  <popups>
--    <popup name="button3">
--      <menuitem
--       name="About Me Item"
--       verb="GdmAboutMe"
--       _label="Edit Personal _Information"/>
--      <menuitem
--       name="Users and Groups Admin Item"
--       verb="GdmUsersGroupsAdmin"
--       _label="_Edit Users and Groups"/>
--      <menuitem
--       name="About Item"
--       verb="GdmAbout"
--       _label="_About"
--       pixtype="stock"
--       pixname="gtk-about"/>
--    </popup>
--  </popups>
--</Root>
-diff --git a/gui/user-switch-applet/Makefile.am b/gui/user-switch-applet/Makefile.am
-index 2d2cdc0..cebe890 100644
---- a/gui/user-switch-applet/Makefile.am
-+++ b/gui/user-switch-applet/Makefile.am
-@@ -13,6 +13,7 @@ AM_CPPFLAGS = \
- 	-DLIBEXECDIR=\""$(libexecdir)"\" 		\
- 	-DSBINDIR=\""$(sbindir)"\"		 	\
- 	-DGDMCONFDIR=\"$(gdmconfdir)\"			\
-+	-DGDM_USER_SWITCH_MENU_UI_DIR="\"$(uidir)\""	\
- 	$(GTK_CFLAGS)					\
- 	$(APPLET_CFLAGS)				\
- 	$(NULL)
-@@ -34,34 +35,31 @@ gdm_user_switch_applet_LDADD = 		\
- 	$(APPLET_LIBS)					\
- 	$(NULL)
- 
--# Bonobo UI
--uidir =	$(datadir)/gnome-2.0/ui
--ui_DATA =					\
--	GNOME_FastUserSwitchApplet.xml		\
--	$(NULL)
-+uidir   = $(datadir)/gnome-2.0/ui
-+ui_DATA = gdm-user-switch-applet-menu.xml
- 
--# Bonobo .server
--serverdir = $(libdir)/bonobo/servers
--server_in_files =				\
--	GNOME_FastUserSwitchApplet.server.in	\
--	$(NULL)
--server_DATA = $(server_in_files:.server.in=.server)
-+appletdir       = $(datadir)/gnome-panel/applets
-+applet_in_files = org.gnome.gdm.UserSwitch.panel-applet.in
-+applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
- 
--$(server_in_files): $(server_in_files:.server.in=.server.in.in)
--	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
-+$(applet_in_files): $(applet_in_files).in Makefile
-+	$(AM_V_GEN)$(SED) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@
- 
--@INTLTOOL_SERVER_RULE@
-+%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
- 
--EXTRA_DIST = 			\
--	$(ui_DATA)		\
--	GNOME_FastUserSwitchApplet.server.in.in	\
--	$(NULL)
-+servicedir = $(datadir)/dbus-1/services
-+service_in_files = org.gnome.panel.applet.GdmUserSwitchAppletFactory.service.in
-+service_DATA     = $(service_in_files:.service.in=.service)
-+
-+org.gnome.panel.applet.GdmUserSwitchAppletFactory.service: $(service_in_files)
-+	$(AM_V_GEN)$(SED) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-+
-+EXTRA_DIST = org.gnome.gdm.UserSwitch.panel-applet.in.in \
-+	     $(service_in_files)                         \
-+	     $(ui_DATA)                                  \
-+	     $(NULL)
-+
-+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
- 
--DISTCLEANFILES =                        \
--	$(server_in_files)		\
--	$(server_DATA)			\
--        $(NULL)
-+MAINTAINERCLEANFILES = *~ Makefile.in
- 
--MAINTAINERCLEANFILES =                  \
--        *~                              \
--        Makefile.in
-diff --git a/gui/user-switch-applet/applet.c b/gui/user-switch-applet/applet.c
-index b4f944c..74f7882 100644
---- a/gui/user-switch-applet/applet.c
-+++ b/gui/user-switch-applet/applet.c
-@@ -34,9 +34,6 @@
- 
- #include <dbus/dbus-glib.h>
- 
--#include <bonobo/bonobo-main.h>
--#include <bonobo/bonobo-ui-util.h>
--
- #include <panel-applet.h>
- #include <panel-applet-gconf.h>
- 
-@@ -102,16 +99,15 @@ static gboolean applet_factory (PanelApplet   *applet,
-                                 const char    *iid,
-                                 gpointer       data);
- 
--PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory",
--                             PANEL_TYPE_APPLET,
--                             "gdm-user-switch-applet", "0",
--                             (PanelAppletFactoryCallback)applet_factory,
--                             NULL)
-+PANEL_APPLET_OUT_PROCESS_FACTORY ("GdmUserSwitchAppletFactory",
-+                                  PANEL_TYPE_APPLET,
-+                                  "gdm-user-switch-applet",
-+                                  applet_factory,
-+                                  NULL)
- 
- static void
--about_me_cb (BonoboUIComponent *ui_container,
--             gpointer           data,
--             const char        *cname)
-+about_me_cb (GtkAction         *action,
-+             gpointer           data)
- {
-         GError *err;
- 
-@@ -120,10 +116,7 @@ about_me_cb (BonoboUIComponent *ui_container,
-                 g_critical ("Could not run `gnome-about-me': %s",
-                             err->message);
-                 g_error_free (err);
--                bonobo_ui_component_set_prop (ui_container,
--                                              "/commands/GdmAboutMe",
--                                              "hidden", "1",
--                                              NULL);
-+                gtk_action_set_visible (action, FALSE);
-         }
- }
- 
-@@ -149,9 +142,8 @@ menubar_button_press_event_cb (GtkWidget      *menubar,
- }
- 
- static void
--about_cb (BonoboUIComponent *ui_container,
--          gpointer           data,
--          const char        *cname)
-+about_cb (GtkAction         *action,
-+          gpointer           data)
- {
-         static const char *authors[] = {
-                 "James M. Cape <jcape@ignore-your.tv>",
-@@ -195,9 +187,8 @@ about_cb (BonoboUIComponent *ui_container,
- 
- 
- static void
--admin_cb (BonoboUIComponent *ui_container,
--          gpointer           data,
--          const char        *cname)
-+admin_cb (GtkAction         *action,
-+          gpointer           data)
- {
- #ifdef USERS_ADMIN
-         char   **args;
-@@ -231,82 +222,6 @@ admin_cb (BonoboUIComponent *ui_container,
- }
- 
- static void
--set_menuitem_icon (BonoboUIComponent *component,
--                   const char        *item_path,
--                   GtkIconTheme      *theme,
--                   const char        *icon_name,
--                   gint               icon_size)
--{
--        GdkPixbuf *pixbuf;
--        int        width;
--        int        height;
--
--        pixbuf = gtk_icon_theme_load_icon (theme, icon_name, icon_size, 0, NULL);
--        if (pixbuf == NULL) {
--                return;
--        }
--
--        width = gdk_pixbuf_get_width (pixbuf);
--        height = gdk_pixbuf_get_height (pixbuf);
--        if (width > icon_size + 4 || height > icon_size + 4) {
--                GdkPixbuf *tmp;
--                if (height > width) {
--                        width *= (gdouble) icon_size / (gdouble) height;
--                        height = icon_size;
--                } else {
--                        height *= (gdouble) icon_size / (gdouble) width;
--                        width = icon_size;
--                }
--                tmp = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR);
--                g_object_unref (pixbuf);
--                pixbuf = tmp;
--        }
--
--        bonobo_ui_util_set_pixbuf (component, item_path, pixbuf, NULL);
--        g_object_unref (pixbuf);
--}
--
--static void
--applet_style_set_cb (GtkWidget *widget,
--                     GtkStyle  *old_style,
--                     gpointer   data)
--{
--        BonoboUIComponent *component;
--        GdkScreen         *screen;
--        GtkIconTheme      *theme;
--        int                width;
--        int                height;
--        int                icon_size;
--
--        if (gtk_widget_has_screen (widget)) {
--                screen = gtk_widget_get_screen (widget);
--        } else {
--                screen = gdk_screen_get_default ();
--        }
--
--        if (gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen),
--                                               GTK_ICON_SIZE_MENU, &width, &height)) {
--                icon_size = MAX (width, height);
--        } else {
--                icon_size = 16;
--        }
--
--        theme = gtk_icon_theme_get_for_screen (screen);
--        component = panel_applet_get_popup_component (PANEL_APPLET (widget));
--
--        set_menuitem_icon (component,
--                           "/commands/GdmAboutMe",
--                           theme,
--                           "user-info",
--                           icon_size);
--        set_menuitem_icon (component,
--                           "/commands/GdmUsersGroupsAdmin",
--                           theme,
--                           "stock_people",
--                           icon_size);
--}
--
--static void
- applet_change_background_cb (PanelApplet               *applet,
-                              PanelAppletBackgroundType  type,
-                              GdkColor                  *color,
-@@ -1389,18 +1304,23 @@ on_presence_status_text_changed (DBusGProxy    *presence_proxy,
- static gboolean
- fill_applet (PanelApplet *applet)
- {
--        static const BonoboUIVerb menu_verbs[] = {
--                BONOBO_UI_VERB ("GdmAboutMe", about_me_cb),
--                BONOBO_UI_VERB ("GdmUsersGroupsAdmin", admin_cb),
--                BONOBO_UI_VERB ("GdmAbout", about_cb),
--                BONOBO_UI_VERB_END
-+        static const GtkActionEntry gdm_user_switch_applet_actions[] = {
-+                { "GdmAboutMe", "user-info", N_("Edit Personal _Information"),
-+                  NULL, NULL,
-+                  G_CALLBACK (about_me_cb) },
-+                { "GdmUsersGroupsAdmin", "stock-people", N_("_Edit Users and Groups"),
-+                  NULL, NULL,
-+                  G_CALLBACK (admin_cb) },
-+                { "GdmAbout", GTK_STOCK_ABOUT, N_("_About"),
-+                  NULL, NULL,
-+                  G_CALLBACK (about_cb) },
-         };
-         static gboolean    first_time = FALSE;
-         char              *tmp;
--        BonoboUIComponent *popup_component;
-         GdmAppletData     *adata;
-         GError            *error;
-         DBusGConnection   *bus;
-+        GtkActionGroup    *action_group;
- 
-         if (!first_time) {
-                 first_time = TRUE;
-@@ -1438,52 +1358,51 @@ fill_applet (PanelApplet *applet)
-         gtk_container_set_border_width (GTK_CONTAINER (applet), 0);
-         gtk_widget_set_name (GTK_WIDGET (applet), "gdm-user-switch-applet");
-         panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR);
--        panel_applet_setup_menu_from_file (applet, NULL,
--                                           DATADIR "/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml",
--                                           NULL, menu_verbs, adata);
- 
--        popup_component = panel_applet_get_popup_component (applet);
-+        action_group = gtk_action_group_new ("GDM User Switch Applet Actions");
-+        gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE);
-+        gtk_action_group_add_actions (action_group,
-+                                      gdm_user_switch_applet_actions,
-+                                      G_N_ELEMENTS (gdm_user_switch_applet_actions),
-+                                      adata);
-+
-+        panel_applet_setup_menu_from_file (applet,
-+                                           GDM_USER_SWITCH_MENU_UI_DIR G_DIR_SEPARATOR_S "gdm-user-switch-applet-menu.xml",
-+                                           action_group);
- 
-         /* Hide the admin context menu items if locked down or no cmd-line */
-         if (gconf_client_get_bool (adata->client,
-                                    LOCKDOWN_COMMAND_LINE_KEY,
-                                    NULL) ||
-             panel_applet_get_locked_down (applet)) {
--                bonobo_ui_component_set_prop (popup_component,
--                                              "/popups/button3/GdmSeparator",
--                                              "hidden", "1", NULL);
--                bonobo_ui_component_set_prop (popup_component,
--                                              "/commands/GdmUsersGroupsAdmin",
--                                              "hidden", "1", NULL);
-+                GtkAction *action;
-+
-+                action = gtk_action_group_get_action (action_group, "GdmUsersGroupsAdmin");
-+                gtk_action_set_visible (action, FALSE);
-         } else {
-+                GtkAction *action;
-+
- #ifndef USERS_ADMIN
- #  ifdef GDM_SETUP
--                bonobo_ui_component_set_prop (popup_component,
--                                              "/popups/button3/GdmSeparator",
--                                              "hidden", "1",
--                                              NULL);
- #  endif /* !GDM_SETUP */
--                bonobo_ui_component_set_prop (popup_component,
--                                              "/commands/GdmUsersGroupsAdmin",
--                                              "hidden", "1",
--                                              NULL);
-+                action = gtk_action_group_get_action (action_group, "GdmUsersGroupsAdmin");
-+                gtk_action_set_visible (action, FALSE);
- #endif /* !USERS_ADMIN */
-         }
- 
-         /* Hide the gdmphotosetup item if it can't be found in the path. */
-         tmp = g_find_program_in_path ("gnome-about-me");
-         if (!tmp) {
--                bonobo_ui_component_set_prop (popup_component,
--                                              "/commands/GdmAboutMe",
--                                              "hidden", "1",
--                                              NULL);
-+                GtkAction *action;
-+
-+                action = gtk_action_group_get_action (action_group, "GdmAboutMe");
-+                gtk_action_set_visible (action, FALSE);
-         } else {
-                 g_free (tmp);
-         }
- 
--        g_signal_connect (adata->applet,
--                          "style-set",
--                          G_CALLBACK (applet_style_set_cb), adata);
-+        g_object_unref (action_group);
-+
-         g_signal_connect (applet,
-                           "change-background",
-                           G_CALLBACK (applet_change_background_cb), adata);
-@@ -1655,7 +1574,7 @@ applet_factory (PanelApplet   *applet,
- {
-         gboolean ret;
-         ret = FALSE;
--        if (strcmp (iid, "OAFIID:GNOME_FastUserSwitchApplet") == 0) {
-+        if (strcmp (iid, "GdmUserSwitchApplet") == 0) {
-                 ret = fill_applet (applet);
-         }
-         return ret;
-diff --git a/gui/user-switch-applet/gdm-user-switch-applet-menu.xml b/gui/user-switch-applet/gdm-user-switch-applet-menu.xml
-new file mode 100644
-index 0000000..78301b3
---- /dev/null
-+++ b/gui/user-switch-applet/gdm-user-switch-applet-menu.xml
-@@ -0,0 +1,4 @@
-+<menuitem name="About Me Item" action="GdmAboutMe"/>
-+<menuitem name="Users and Groups Admin Item" action="GdmUsersGroupsAdmin"/>
-+<menuitem name="About Item" action="GdmAbout"/>
-+
-diff --git a/gui/user-switch-applet/org.gnome.gdm.UserSwitch.panel-applet.in.in b/gui/user-switch-applet/org.gnome.gdm.UserSwitch.panel-applet.in.in
-new file mode 100644
-index 0000000..3c77dfb
---- /dev/null
-+++ b/gui/user-switch-applet/org.gnome.gdm.UserSwitch.panel-applet.in.in
-@@ -0,0 +1,16 @@
-+[Applet Factory]
-+Id=GdmUserSwitchAppletFactory
-+Location=@LIBEXECDIR@/gdm-user-switch-applet
-+_Name=User Switcher Applet Factory
-+_Description=User Switcher Applet Factory
-+
-+[GdmUserSwitchApplet]
-+_Name=User Switcher
-+_Description=A menu to quickly switch between users
-+BonoboId=OAFIID:GNOME_FastUserSwitchApplet
-+X-GNOME-Bugzilla-Bugzilla=GNOME
-+X-GNOME-Bugzilla-Product=gdm
-+X-GNOME-Bugzilla-Component=general
-+X-GNOME-Bugzilla-Version=@VERSION@
-+X-GNOME-Bugzilla-OtherBinaries=gdm-user-switch-applet
-+
-diff --git a/gui/user-switch-applet/org.gnome.panel.applet.GdmUserSwitchAppletFactory.service.in b/gui/user-switch-applet/org.gnome.panel.applet.GdmUserSwitchAppletFactory.service.in
-new file mode 100644
-index 0000000..7bf900f
---- /dev/null
-+++ b/gui/user-switch-applet/org.gnome.panel.applet.GdmUserSwitchAppletFactory.service.in
-@@ -0,0 +1,4 @@
-+[D-BUS Service]
-+Name=org.gnome.panel.applet.GdmUserSwitchAppletFactory
-+Exec=@LIBEXECDIR@/gdm-user-switch-applet
-+
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index 1fccb90..5340391 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -86,8 +86,7 @@ gui/simple-greeter/gdm-user-chooser-widget.c
- gui/simple-greeter/greeter-main.c
- gui/user-switch-applet/applet.c
- gui/user-switch-applet/gdm-entry-menu-item.c
--gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
--gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml
-+gui/user-switch-applet/org.gnome.gdm.UserSwitch.panel-applet.in.in
- utils/gdmflexiserver.c
- utils/gdm-screenshot.c
- 
-diff --git a/po/POTFILES.skip b/po/POTFILES.skip
-index 0269a0f..9032c03 100644
---- a/po/POTFILES.skip
-+++ b/po/POTFILES.skip
-@@ -7,7 +7,7 @@
- # remove these unless you fix "make distcheck" a different way.
- #
- data/gdm.schemas.in
--gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in
-+gui/user-switch-applet/org.gnome.gdm.UserSwitch.panel-applet.in
- data/greeter-autostart/at-spi-registryd-wrapper.desktop.in
- data/greeter-autostart/gdm-simple-greeter.desktop.in
- data/greeter-autostart/gnome-power-manager.desktop.in
--- 
-1.7.2.3
-
diff --git a/extra/gdm/04_fix_external_program_directories.patch b/extra/gdm/04_fix_external_program_directories.patch
deleted file mode 100644
index 7ccc28644..000000000
--- a/extra/gdm/04_fix_external_program_directories.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nur gdm-2.30.2.orig/daemon/gdm-server.c gdm-2.30.2/daemon/gdm-server.c
---- gdm-2.30.2.orig/daemon/gdm-server.c	2010-04-26 20:08:42.000000000 +0300
-+++ gdm-2.30.2/daemon/gdm-server.c	2010-04-29 22:55:49.631648355 +0300
-@@ -127,7 +127,7 @@
-         g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
- 
-         error = NULL;
--        command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
-+        command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s",
-                                    server->priv->display_name);
- 
-         g_debug ("GdmServer: Running helper %s", command);
-diff -Nur gdm-2.30.2.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.30.2/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
---- gdm-2.30.2.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2010-03-17 23:27:16.000000000 +0200
-+++ gdm-2.30.2/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2010-04-29 22:53:54.984878068 +0300
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Type=Application
- _Name=GNOME Settings Daemon
--TryExec=@LIBEXECDIR@/gnome-settings-daemon
--Exec=@LIBEXECDIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
-+TryExec=/usr/bin/gnome-settings-daemon
-+Exec=/usr/bin/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
- OnlyShowIn=GNOME;
- X-GNOME-Autostart-Phase=Initialization
- X-GNOME-Autostart-Notify=true
-diff -Nur gdm-2.30.2.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in gdm-2.30.2/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
---- gdm-2.30.2.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2010-03-26 15:28:03.000000000 +0200
-+++ gdm-2.30.2/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2010-04-29 22:54:24.638396328 +0300
-@@ -1,5 +1,5 @@
- [Desktop Entry]
- Type=Application
- _Name=PolicyKit Authentication Agent
--Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1
-+Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
- OnlyShowIn=GNOME;
-diff -Nur gdm-2.30.2.orig/gui/simple-chooser/gdm-chooser-session.c gdm-2.30.2/gui/simple-chooser/gdm-chooser-session.c
---- gdm-2.30.2.orig/gui/simple-chooser/gdm-chooser-session.c	2010-03-17 23:27:16.000000000 +0200
-+++ gdm-2.30.2/gui/simple-chooser/gdm-chooser-session.c	2010-04-29 22:57:08.691626507 +0300
-@@ -131,7 +131,7 @@
-         ret = FALSE;
- 
-         error = NULL;
--        g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error);
-+        g_spawn_command_line_async ("/usr/bin/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-chooser/settings-manager-plugins", &error);
-         if (error != NULL) {
-                 g_warning ("Error starting settings daemon: %s", error->message);
-                 g_error_free (error);
diff --git a/extra/gdm/correctly-give-focus-to-user-chooser.patch b/extra/gdm/correctly-give-focus-to-user-chooser.patch
deleted file mode 100644
index e08675a36..000000000
--- a/extra/gdm/correctly-give-focus-to-user-chooser.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b971eb1038cb92ed8211b68a7d2a99a98d86ed7f Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz@gnome.org>
-Date: Wed, 12 Jan 2011 18:38:46 +0100
-Subject: [PATCH] Correctly give focus to the user chooser on startup
-
-We manually handle how focus works in the GdmChooserWidget container,
-and we try to automatically move the focus to the treeview inside the
-chooser. However, it fails the first time because the treeview is not
-realized yet and the logic in the code assumes that if focus moved to
-the chooser, it moved to the treeview, so later attempt to get the focus
-grabbed by the treeview are just ignored.
-
-It works fine when using gtk_widget_child_focus() to give the focus to
-the treeview. And this makes more sense since the chooser is a container
-anyway.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=629310
----
- gui/simple-greeter/gdm-chooser-widget.c |    6 +-----
- 1 files changed, 1 insertions(+), 5 deletions(-)
-
-diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c
-index db2d9b2..ebbfdb9 100644
---- a/gui/simple-greeter/gdm-chooser-widget.c
-+++ b/gui/simple-greeter/gdm-chooser-widget.c
-@@ -910,17 +910,13 @@ _grab_focus (GtkWidget *widget)
- 
-         foc_widget = GDM_CHOOSER_WIDGET (widget)->priv->items_view;
-         g_debug ("GdmChooserWidget: grabbing focus");
--        if (! gtk_widget_get_realized (foc_widget)) {
--                g_debug ("GdmChooserWidget: not grabbing focus - not realized");
--                return;
--        }
- 
-         if (gtk_widget_has_focus (foc_widget)) {
-                 g_debug ("GdmChooserWidget: not grabbing focus - already has it");
-                 return;
-         }
- 
--        gtk_widget_grab_focus (foc_widget);
-+        gtk_widget_child_focus (foc_widget, GTK_DIR_TAB_FORWARD);
- }
- 
- static void
---
-1.7.3.4
diff --git a/extra/gnome-applets/add-dbus-glib.patch b/extra/gnome-applets/add-dbus-glib.patch
deleted file mode 100644
index 16c2999a8..000000000
--- a/extra/gnome-applets/add-dbus-glib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From fe72f63c91a1458d97d455ab0078d042464366e7 Mon Sep 17 00:00:00 2001
-From: Enrico Minack <enrico-minack@gmx.de>
-Date: Mon, 03 Jan 2011 19:58:13 +0000
-Subject: gweather: fixes NetworkManager support to compile, see bug 636217
-
----
-diff --git a/gweather/Makefile.am b/gweather/Makefile.am
-index ea6ac96..165efda 100644
---- a/gweather/Makefile.am
-+++ b/gweather/Makefile.am
-@@ -6,6 +6,7 @@ INCLUDES =					\
- 	-I$(srcdir)				\
- 	-I$(top_srcdir)				\
- 	-DGWEATHER_MENU_UI_DIR=\""$(uidir)"\"	\
-+	$(DBUS_CFLAGS)				\
- 	$(GNOME_APPLETS3_CFLAGS)		\
- 	$(LIBNOTIFY_CFLAGS)			\
- 	$(LIBGWEATHER_CFLAGS)			\
-@@ -22,6 +23,7 @@ gweather_applet_2_SOURCES = \
- 	gweather-applet.c gweather-applet.h
- 
- gweather_applet_2_LDADD = 	\
-+	$(DBUS_LIBS)		\
- 	$(LIBNOTIFY_LIBS) 	\
- 	$(GNOME_APPLETS3_LIBS)	\
- 	$(GNOME_LIBS2_LIBS)	\
---
-cgit v0.8.3.4
diff --git a/extra/gnome-applets/gnome-applets-2.32.1.1-libnotify-0.7.patch b/extra/gnome-applets/gnome-applets-2.32.1.1-libnotify-0.7.patch
deleted file mode 100644
index f2b889ec0..000000000
--- a/extra/gnome-applets/gnome-applets-2.32.1.1-libnotify-0.7.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- battstat/battstat_applet.c
-+++ battstat/battstat_applet.c
-@@ -42,6 +42,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- #include "battstat.h"
-@@ -435,7 +438,12 @@
- 			GTK_ICON_LOOKUP_USE_BUILTIN,
- 			NULL);
- 	
--	NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL, applet);
-+	NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+	);
-+#else
-+	, applet);
-+#endif
- 
- 	/* XXX: it would be nice to pass this as a named icon */
- 	notify_notification_set_icon_from_pixbuf (n, icon);
---- gweather/gweather-applet.c
-+++ gweather/gweather-applet.c
-@@ -30,6 +30,9 @@
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
- #include <libnotify/notification.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
-@@ -471,8 +474,12 @@
- 			 if (icon == NULL)
- 				 icon = "stock-unknown";
- 	           	 
--			 n = notify_notification_new (message, detail, icon,
--					 gw_applet->container);
-+			 n = notify_notification_new (message, detail, icon
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+			 );
-+#else
-+			 , gw_applet->container);
-+#endif
- 	
- 		   	 notify_notification_show (n, &error);
- 			 if (error)
diff --git a/extra/gnome-bluetooth/gnome-bluetooth-2.32.0-libnotify-0.7.patch b/extra/gnome-bluetooth/gnome-bluetooth-2.32.0-libnotify-0.7.patch
deleted file mode 100644
index 72a726521..000000000
--- a/extra/gnome-bluetooth/gnome-bluetooth-2.32.0-libnotify-0.7.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- applet/notify.c
-+++ applet/notify.c
-@@ -31,6 +31,10 @@
- #include <libnotify/notify.h>
- #include "notify.h"
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- static GtkStatusIcon *statusicon = NULL;
- static char *icon_name = NULL;
- static char *tooltip = NULL;
-@@ -71,7 +75,12 @@
- 		notify_notification_close(notify, NULL);
- 	}
- 
--	notify = notify_notification_new(summary, message, icon_name, NULL);
-+	notify = notify_notification_new(summary, message, icon_name
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+	);
-+#else
-+	, NULL);
-+#endif
- 
- 	notify_notification_set_timeout(notify, timeout);
- 
diff --git a/extra/gnome-games/03_missing_icons.patch b/extra/gnome-games/03_missing_icons.patch
deleted file mode 100644
index c9bfe9be5..000000000
--- a/extra/gnome-games/03_missing_icons.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: gnome-games-2.30.2/libgames-support/games-stock.c
-===================================================================
---- gnome-games-2.30.2.orig/libgames-support/games-stock.c	2010-07-04 11:33:16.880062363 +0200
-+++ gnome-games-2.30.2/libgames-support/games-stock.c	2010-07-04 12:23:59.035567621 +0200
-@@ -282,15 +282,14 @@ games_stock_init (void)
- #ifdef HAVE_GTK_ICON_FACTORY_ADD_ALIAS
-     { GAMES_STOCK_REDO_MOVE,        GTK_STOCK_REDO },
-     { GAMES_STOCK_UNDO_MOVE,        GTK_STOCK_UNDO },
-+    { GAMES_STOCK_RESUME_GAME,      GTK_STOCK_MEDIA_PLAY },
- #endif
- #ifndef HAVE_HILDON
-     { GAMES_STOCK_NETWORK_GAME,     GTK_STOCK_NETWORK },
-     { GAMES_STOCK_NETWORK_LEAVE,    GTK_STOCK_STOP },
-     { GAMES_STOCK_PLAYER_LIST,      GTK_STOCK_INFO },
- 
--    { GAMES_STOCK_PAUSE_GAME,       "stock_timer_stopped" },
--    { GAMES_STOCK_RESUME_GAME,      "stock_timer" },
--    { GAMES_STOCK_SCORES,           "stock_scores" },
-+    { GAMES_STOCK_PAUSE_GAME,       GTK_STOCK_MEDIA_PAUSE },
- #endif /* !HAVE_HILDON */
-   };
- 
-@@ -298,6 +297,7 @@ games_stock_init (void)
-   const char *stock_icon_aliases_bidi[][3] = {
-     { GAMES_STOCK_REDO_MOVE, GTK_STOCK_REDO "-ltr", GTK_STOCK_REDO "-rtl" },
-     { GAMES_STOCK_UNDO_MOVE, GTK_STOCK_UNDO "-ltr", GTK_STOCK_UNDO "-rtl" },
-+    { GAMES_STOCK_RESUME_GAME, GTK_STOCK_MEDIA_PLAY "-ltr", GTK_STOCK_MEDIA_PLAY "-rtl" },
-   };
- #endif
- 
-@@ -306,6 +306,7 @@ games_stock_init (void)
- #ifndef HAVE_HILDON
-     { GAMES_STOCK_TELEPORT, "teleport" },
-     { GAMES_STOCK_RTELEPORT, "teleport-random" },
-+    { GAMES_STOCK_SCORES, "scores" },
- #endif /* !HAVE_HILDON */
-     { GAMES_STOCK_DEAL_CARDS, "cards-deal" }
-   };
diff --git a/extra/gnome-games/scores.png b/extra/gnome-games/scores.png
deleted file mode 100644
index fb8ea036f..000000000
--- a/extra/gnome-games/scores.png
+++ /dev/null
diff --git a/extra/gnome-panel/evolution-appointments.patch b/extra/gnome-panel/evolution-appointments.patch
deleted file mode 100644
index c4831adf2..000000000
--- a/extra/gnome-panel/evolution-appointments.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c
-index 932ebda..bfad14e 100644
---- a/applets/clock/calendar-window.c
-+++ b/applets/clock/calendar-window.c
-@@ -450,6 +450,8 @@ is_appointment (GtkTreeModel *model,
- 	gtk_tree_model_get (model, iter, APPOINTMENT_COLUMN_URI, &uri, -1);
- 	if (uri)
- 		return (g_ascii_strcasecmp (uri, "file")   == 0 ||
-+			g_ascii_strcasecmp (uri, "local")   == 0 ||
-+			g_ascii_strcasecmp (uri, "mapi")   == 0 ||
- 			g_ascii_strcasecmp (uri, "webcal") == 0 ||
- 			g_ascii_strcasecmp (uri, "caldav") == 0 ||
- 			g_ascii_strcasecmp (uri, "exchange")  == 0 ||
diff --git a/extra/gnome-panel/gnome-panel-bonobo.install b/extra/gnome-panel/gnome-panel-bonobo.install
deleted file mode 100644
index 0bc8c431e..000000000
--- a/extra/gnome-panel/gnome-panel-bonobo.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/gio-querymodules usr/lib/gnome-panel/modules
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/extra/gnome-power-manager/gnome-power-manager-2.32.0-libnotify-0.7.patch b/extra/gnome-power-manager/gnome-power-manager-2.32.0-libnotify-0.7.patch
deleted file mode 100644
index d021f2930..000000000
--- a/extra/gnome-power-manager/gnome-power-manager-2.32.0-libnotify-0.7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/gpm-manager.c
-+++ src/gpm-manager.c
-@@ -43,6 +43,10 @@
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- #include "egg-debug.h"
- #include "egg-console-kit.h"
- 
-@@ -480,12 +484,16 @@
- 	/* close any existing notification of this class */
- 	gpm_manager_notify_close (manager, *notification_class);
- 
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+	notification = notify_notification_new (title, message, icon);
-+#else
- 	/* if the status icon is hidden, don't point at it */
- 	if (manager->priv->status_icon != NULL &&
- 	    gtk_status_icon_is_embedded (manager->priv->status_icon))
- 		notification = notify_notification_new_with_status_icon (title, message, icon, manager->priv->status_icon);
- 	else
- 		notification = notify_notification_new (title, message, icon, NULL);
-+#endif
- 	notify_notification_set_timeout (notification, timeout);
- 	notify_notification_set_urgency (notification, urgency);
- 	g_signal_connect (notification, "closed", G_CALLBACK (gpm_manager_notification_closed_cb), notification_class);
diff --git a/extra/gnome-screensaver/gnome-screensaver-2.30.2-libnotify-0.7.patch b/extra/gnome-screensaver/gnome-screensaver-2.30.2-libnotify-0.7.patch
deleted file mode 100644
index 6eeb16819..000000000
--- a/extra/gnome-screensaver/gnome-screensaver-2.30.2-libnotify-0.7.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Nur gnome-screensaver-2.30.2.orig/src/gs-lock-plug.c gnome-screensaver-2.30.2/src/gs-lock-plug.c
---- gnome-screensaver-2.30.2.orig/src/gs-lock-plug.c	2010-09-28 13:36:51.000000000 -0700
-+++ gnome-screensaver-2.30.2/src/gs-lock-plug.c	2011-03-07 00:54:44.086669840 -0800
-@@ -47,6 +47,10 @@
- #include <libnotify/notify.h>
- #endif
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- #include "gs-lock-plug.h"
- 
- #include "gs-debug.h"
-@@ -1090,7 +1094,11 @@
-         strftime (summary, 128, "%X", tmp);
- 
-         notify_init ("gnome-screensaver-dialog");
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+        note = notify_notification_new (summary, escaped_text, NULL);
-+#else
-         note = notify_notification_new (summary, escaped_text, NULL, NULL);
-+#endif
-         notify_notification_set_timeout (note, NOTIFY_EXPIRES_NEVER);
-         notify_notification_show (note, NULL);
-         g_object_unref (note);
diff --git a/extra/gnome-settings-daemon/add_notify_init.patch b/extra/gnome-settings-daemon/add_notify_init.patch
deleted file mode 100644
index b1e644f5d..000000000
--- a/extra/gnome-settings-daemon/add_notify_init.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur gnome-settings-daemon-2.32.1.orig/plugins/xrandr/gsd-xrandr-manager.c gnome-settings-daemon-2.32.1/plugins/xrandr/gsd-xrandr-manager.c
---- gnome-settings-daemon-2.32.1.orig/plugins/xrandr/gsd-xrandr-manager.c	2010-11-15 05:11:00.000000000 -0800
-+++ gnome-settings-daemon-2.32.1/plugins/xrandr/gsd-xrandr-manager.c	2011-03-17 11:52:57.516694024 -0700
-@@ -2530,6 +2530,10 @@
- 
-         manager->priv->current_fn_f7_config = -1;
-         manager->priv->fn_f7_configs = NULL;
-+
-+#ifdef HAVE_LIBNOTIFY
-+        notify_init ("gnome-settings-daemon");
-+#endif /* HAVE_LIBNOTIFY */
- }
- 
- static void
diff --git a/extra/gnome-settings-daemon/gnome-settings-daemon-2.32.1-libnotify-0.7.patch b/extra/gnome-settings-daemon/gnome-settings-daemon-2.32.1-libnotify-0.7.patch
deleted file mode 100644
index f755f24ac..000000000
--- a/extra/gnome-settings-daemon/gnome-settings-daemon-2.32.1-libnotify-0.7.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-+++ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
-@@ -48,6 +48,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif /* HAVE_LIBNOTIFY */
- 
- #include "gnome-settings-profile.h"
-@@ -608,9 +611,13 @@
-         gsd_a11y_keyboard_manager_ensure_status_icon (manager);
-         manager->priv->notification = notify_notification_new (title,
-                                                                message,
--                                                               "preferences-desktop-accessibility",
--                                                               NULL);
-+                                                               "preferences-desktop-accessibility"
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+                                                               );
-+#else
-+                                                               , NULL);
-         notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
-+#endif
-         notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
- 
-         notify_notification_add_action (manager->priv->notification,
-@@ -747,9 +754,13 @@
-         gsd_a11y_keyboard_manager_ensure_status_icon (manager);
-         manager->priv->notification = notify_notification_new (title,
-                                                                message,
--                                                               "preferences-desktop-accessibility",
--                                                               NULL);
-+                                                               "preferences-desktop-accessibility"
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+                                                               );
-+#else
-+                                                               , NULL);
-         notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
-+#endif
-         notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
- 
-         notify_notification_add_action (manager->priv->notification,
---- plugins/xrandr/gsd-xrandr-manager.c
-+++ plugins/xrandr/gsd-xrandr-manager.c
-@@ -48,6 +48,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- #include "gnome-settings-profile.h"
-@@ -1086,6 +1089,11 @@
- 
-         g_assert (error_to_display == NULL || secondary_text == NULL);
- 
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+	notification = notify_notification_new (primary_text,
-+							error_to_display ? error_to_display->message : secondary_text,
-+							GSD_XRANDR_ICON_NAME);
-+#else
-         if (priv->status_icon)
-                 notification = notify_notification_new_with_status_icon (primary_text,
-                                                                          error_to_display ? error_to_display->message : secondary_text,
-@@ -1096,6 +1104,7 @@
-                                                         error_to_display ? error_to_display->message : secondary_text,
-                                                         GSD_XRANDR_ICON_NAME,
-                                                         NULL);
-+#endif
- 
-         notify_notification_show (notification, NULL); /* NULL-GError */
- #else
diff --git a/extra/gnome-settings-daemon/gstreamer-volume-2.29.91.patch b/extra/gnome-settings-daemon/gstreamer-volume-2.29.91.patch
deleted file mode 100644
index 847a57622..000000000
--- a/extra/gnome-settings-daemon/gstreamer-volume-2.29.91.patch
+++ /dev/null
@@ -1,809 +0,0 @@
-diff -Nur gnome-settings-daemon-2.29.91.1.orig/configure.ac gnome-settings-daemon-2.29.91.1/configure.ac
---- gnome-settings-daemon-2.29.91.1.orig/configure.ac	2010-02-24 16:39:10.000000000 +0200
-+++ gnome-settings-daemon-2.29.91.1/configure.ac	2010-02-25 18:18:35.000000000 +0200
-@@ -248,6 +248,48 @@
- AC_SUBST(PULSE_CFLAGS)
- AC_SUBST(PULSE_LIBS)
- 
-+dnl ==============================================
-+dnl GStreamer section
-+dnl ==============================================
-+GST_MAJORMINOR=auto
-+
-+AC_ARG_ENABLE(gstreamer,
-+AC_HELP_STRING([--enable-gstreamer],[use gstreamer if available (and optionally specify a version)]),
-+[case "${enableval}" in
-+ yes) ENABLE_GSTREAMER=yes ;;
-+ 0.10) ENABLE_GSTREAMER=yes && GST_MAJORMINOR=0.10 ;;
-+ no)  ENABLE_GSTREAMER=no ;;
-+ *) AC_MSG_ERROR([
-+                  *** Bad value ${enableval} for --enable-gstreamer
-+                  *** Please use one of the following:
-+                  ***    --enable-gstreamer=0.10
-+               ]) ;;
-+esac],
-+[ENABLE_GSTREAMER=yes]) dnl Default value
-+
-+have_gstreamer=no
-+if test "x$ENABLE_GSTREAMER" = "xyes"; then
-+   GST_REQS=0.10.1.2
-+   PKGS="gstreamer-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GST_REQS"
-+
-+   PKG_CHECK_MODULES(GST, $PKGS, have_gstreamer=yes,
-+                     AC_MSG_RESULT([no]))
-+
-+   if test "x$have_pulse" = "xtrue"; then
-+      AC_MSG_ERROR([*** GStreamer & Pulseaudio both are selected ***])
-+   fi
-+
-+   if test "x$have_gstreamer" = "xyes"; then
-+      GST_LIBS="$GST_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
-+      AC_DEFINE(HAVE_GSTREAMER,1,[enable gstreamer])
-+   fi
-+else
-+   AC_MSG_NOTICE([*** GStreamer support disabled ***])
-+fi
-+AM_CONDITIONAL(HAVE_GSTREAMER, test "x$have_gstreamer" = "xyes")
-+AC_SUBST(GST_LIBS)
-+AC_SUBST(GST_CFLAGS)
-+
- # ---------------------------------------------------------------------------
- # Enable Profiling
- # ---------------------------------------------------------------------------
-@@ -386,6 +428,7 @@
-         dbus-1 system.d dir:      ${DBUS_SYS_DIR}
- 
-         Libnotify support:        ${have_libnotify}
-+        GStreamer support:        ${have_gstreamer}
-         PulseAudio support:       ${have_pulse}
-         Profiling support:        ${enable_profiling}
- "
-diff -Nur gnome-settings-daemon-2.29.91.1.orig/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c gnome-settings-daemon-2.29.91.1/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c
---- gnome-settings-daemon-2.29.91.1.orig/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c	1970-01-01 02:00:00.000000000 +0200
-+++ gnome-settings-daemon-2.29.91.1/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c	2010-02-25 18:18:35.000000000 +0200
-@@ -0,0 +1,402 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-+
-+/* acme-volume.c
-+
-+   Copyright (C) 2002, 2003 Bastien Nocera
-+   Copyright (C) 2004 Novell, Inc.
-+   Copyright (C) 2009 PERIER Romain <mrpouet@tuxfamily.org>
-+
-+   The Gnome Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   The Gnome Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+
-+   Author: Bastien Nocera <hadess@hadess.net>
-+           Jon Trowbridge <trow@ximian.com>
-+*/
-+
-+#include "config.h"
-+#include "gvc-gstreamer-acme-vol.h"
-+
-+#include <gst/gst.h>
-+#include <gst/audio/mixerutils.h>
-+#include <gst/interfaces/mixer.h>
-+#include <gst/interfaces/propertyprobe.h>
-+
-+#include <gconf/gconf-client.h>
-+
-+#include <string.h>
-+
-+#define TIMEOUT	4
-+
-+#define DEFAULT_MIXER_DEVICE_KEY   "/desktop/gnome/sound/default_mixer_device"
-+#define DEFAULT_MIXER_TRACKS_KEY   "/desktop/gnome/sound/default_mixer_tracks"
-+
-+#define ACME_VOLUME_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ACME_TYPE_VOLUME, AcmeVolumePrivate))
-+
-+struct AcmeVolumePrivate {
-+	GstMixer     *mixer;
-+	GList        *mixer_tracks;
-+	guint         timer_id;
-+	gdouble       volume;
-+	gboolean      mute;
-+	GConfClient  *gconf_client;
-+};
-+
-+G_DEFINE_TYPE (AcmeVolume, acme_volume, G_TYPE_OBJECT)
-+
-+static gboolean acme_volume_open  (AcmeVolume *acme);
-+static void     acme_volume_close (AcmeVolume *acme);
-+static gboolean acme_volume_close_real (AcmeVolume *self);
-+
-+static gpointer acme_volume_object = NULL;
-+
-+static void
-+acme_volume_finalize (GObject *object)
-+{
-+	AcmeVolume *self;
-+
-+	g_return_if_fail (object != NULL);
-+	g_return_if_fail (ACME_IS_VOLUME (object));
-+
-+	self = ACME_VOLUME (object);
-+
-+	if (self->_priv->timer_id != 0)
-+		g_source_remove (self->_priv->timer_id);
-+	acme_volume_close_real (self);
-+
-+	if (self->_priv->gconf_client != NULL) {
-+		g_object_unref (self->_priv->gconf_client);
-+		self->_priv->gconf_client = NULL;
-+	}
-+
-+	G_OBJECT_CLASS (acme_volume_parent_class)->finalize (object);
-+}
-+
-+void
-+acme_volume_set_mute (AcmeVolume *self, gboolean val)
-+{
-+	GList *t;
-+
-+	g_return_if_fail(ACME_IS_VOLUME(self));
-+	g_return_if_fail(acme_volume_open(self));
-+
-+	for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) {
-+		GstMixerTrack *track = GST_MIXER_TRACK (t->data);
-+		gst_mixer_set_mute (self->_priv->mixer, track, val);
-+	}
-+	self->_priv->mute = val;
-+	acme_volume_close (self);
-+}
-+
-+static void
-+update_state (AcmeVolume * self)
-+{
-+	gint *volumes, n;
-+	gdouble vol = 0;
-+	GstMixerTrack *track = GST_MIXER_TRACK (self->_priv->mixer_tracks->data);
-+
-+	/* update mixer by getting volume */
-+	volumes = g_new0 (gint, track->num_channels);
-+	gst_mixer_get_volume (self->_priv->mixer, track, volumes);
-+	for (n = 0; n < track->num_channels; n++)
-+		vol += volumes[n];
-+	g_free (volumes);
-+	vol /= track->num_channels;
-+	vol = 100 * vol / (track->max_volume - track->min_volume);
-+
-+	/* update mute flag, and volume if not muted */
-+	if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE))
-+		self->_priv->mute = TRUE;
-+	self->_priv->volume = vol;
-+}
-+
-+gboolean
-+acme_volume_get_mute (AcmeVolume *self)
-+{
-+	g_return_val_if_fail(acme_volume_open(self), FALSE);
-+
-+	update_state (self);
-+	acme_volume_close (self);
-+
-+	return self->_priv->mute;
-+}
-+
-+gint
-+acme_volume_get_volume (AcmeVolume *self)
-+{
-+
-+	g_return_val_if_fail(acme_volume_open(self), 0);
-+
-+	update_state (self);
-+
-+	acme_volume_close (self);
-+	
-+	return (gint) (self->_priv->volume + 0.5);
-+}
-+
-+void
-+acme_volume_set_volume (AcmeVolume *self, gint val)
-+{
-+	GList *t;
-+
-+	g_return_if_fail(acme_volume_open(self));
-+
-+	val = CLAMP (val, 0, 100);
-+
-+	for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) {
-+		GstMixerTrack *track = GST_MIXER_TRACK (t->data);
-+		gint *volumes, n;
-+		gdouble scale = (track->max_volume - track->min_volume) / 100.0;
-+		gint vol = (gint) (val * scale + track->min_volume + 0.5);
-+
-+		volumes = g_new (gint, track->num_channels);
-+		for (n = 0; n < track->num_channels; n++)
-+			volumes[n] = vol;
-+		gst_mixer_set_volume (self->_priv->mixer, track, volumes);
-+		g_free (volumes);
-+	}
-+
-+	/* update state */
-+	self->_priv->volume = val;
-+
-+	acme_volume_close (self);
-+}
-+
-+void
-+acme_volume_mute_toggle (AcmeVolume *self)
-+{
-+	gboolean muted;
-+
-+	g_return_if_fail (self != NULL);
-+	g_return_if_fail (ACME_IS_VOLUME(self));
-+
-+	muted = acme_volume_get_mute(self);
-+	acme_volume_set_mute(self, !muted);
-+}
-+
-+gint
-+acme_volume_get_threshold (AcmeVolume *self)
-+{
-+	GList *t;
-+	gint steps = 101;
-+
-+	g_return_val_if_fail(acme_volume_open(self), 1);
-+
-+	for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) {
-+		GstMixerTrack *track = GST_MIXER_TRACK (t->data);
-+		gint track_steps = track->max_volume - track->min_volume;
-+		if (track_steps > 0 && track_steps < steps)
-+			steps = track_steps;
-+	}
-+
-+	acme_volume_close (self);
-+
-+	return 100 / steps + 1;
-+}
-+
-+static gboolean
-+acme_volume_close_real (AcmeVolume *self)
-+{
-+	if (self->_priv->mixer != NULL)
-+	{
-+		gst_element_set_state (GST_ELEMENT (self->_priv->mixer), GST_STATE_NULL);
-+		gst_object_unref (GST_OBJECT (self->_priv->mixer));
-+		g_list_foreach (self->_priv->mixer_tracks, (GFunc) g_object_unref, NULL);
-+		g_list_free (self->_priv->mixer_tracks);
-+		self->_priv->mixer = NULL;
-+		self->_priv->mixer_tracks = NULL;
-+	}
-+
-+	self->_priv->timer_id = 0;
-+	return FALSE;
-+}
-+
-+/*
-+ * _acme_set_mixer
-+ * @mixer  A pointer to mixer element
-+ * @data   A pointer to user data (AcmeVolume instance to be modified)
-+ * @return A gboolean indicating success if Master track was found, failed otherwises.
-+ */
-+static gboolean
-+_acme_set_mixer(GstMixer *mixer, gpointer user_data)
-+{
-+	const GList *tracks;
-+
-+	for (tracks = gst_mixer_list_tracks (mixer); tracks != NULL; tracks = tracks->next) {
-+		GstMixerTrack *track = GST_MIXER_TRACK (tracks->data);
-+
-+		if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MASTER)) {
-+			AcmeVolume *self;
-+
-+			self = ACME_VOLUME (user_data);
-+
-+			self->_priv->mixer = mixer;
-+			self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track));
-+			return TRUE;
-+		}
-+
-+		continue;
-+	}
-+
-+	return FALSE;
-+}
-+
-+/* This is a modified version of code from gnome-media's gst-mixer */
-+static gboolean
-+acme_volume_open (AcmeVolume *self)
-+{
-+	gchar *mixer_device, **factory_and_device = NULL;
-+	GList *mixer_list;
-+
-+	if (self->_priv->timer_id != 0) {
-+		g_source_remove (self->_priv->timer_id);
-+		self->_priv->timer_id = 0;
-+		return TRUE;
-+	}
-+
-+	mixer_device = gconf_client_get_string (self->_priv->gconf_client, DEFAULT_MIXER_DEVICE_KEY, NULL);
-+	if (mixer_device != NULL)
-+		factory_and_device = g_strsplit (mixer_device, ":", 2);
-+
-+	if (factory_and_device != NULL && factory_and_device[0] != NULL) {
-+		GstElement *element;
-+
-+		element = gst_element_factory_make (factory_and_device[0], NULL);
-+
-+		if (element != NULL) {
-+			if (factory_and_device[1] != NULL &&
-+			    g_object_class_find_property (G_OBJECT_GET_CLASS (element), "device"))
-+				g_object_set (G_OBJECT (element), "device", factory_and_device[1], NULL);
-+			gst_element_set_state (element, GST_STATE_READY);
-+
-+			if (GST_IS_MIXER (element))
-+				self->_priv->mixer = GST_MIXER (element);
-+			else {
-+				gst_element_set_state (element, GST_STATE_NULL);
-+				gst_object_unref (element);
-+			}
-+		}
-+	}
-+
-+	g_free (mixer_device);
-+	g_strfreev (factory_and_device);
-+
-+	if (self->_priv->mixer != NULL) {
-+		const GList *m;
-+		GSList *tracks, *t;
-+		GError *error = NULL;
-+
-+		/* Try to use tracks saved in GConf 
-+		   Note: errors need to be treated , for example if the user set a non type list for this key
-+		   or if the elements type_list are not "matched" */
-+		tracks = gconf_client_get_list (self->_priv->gconf_client, DEFAULT_MIXER_TRACKS_KEY, 
-+						GCONF_VALUE_STRING, &error);
-+
-+		if (error) {
-+			g_warning("ERROR: %s\n", error->message);
-+			g_error_free(error);
-+		}
-+
-+		/* We use these tracks ONLY if they are supported on the system with the following mixer */
-+		for (m = gst_mixer_list_tracks (self->_priv->mixer); m != NULL; m = m->next) {
-+			GstMixerTrack *track = GST_MIXER_TRACK (m->data);
-+
-+			for (t = tracks; t != NULL; t = t->next)
-+				if (!strcmp (t->data, track->label))
-+					self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track));
-+
-+		}
-+
-+		g_slist_foreach (tracks, (GFunc)g_free, NULL);
-+		g_slist_free (tracks);
-+
-+		/* If no track stored in GConf is avaiable try to use Master track */
-+		if (self->_priv->mixer_tracks == NULL) {
-+			for (m = gst_mixer_list_tracks (self->_priv->mixer); m != NULL; m = m->next) {
-+				GstMixerTrack *track = GST_MIXER_TRACK (m->data);
-+
-+				if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MASTER)) {
-+					self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track));
-+					break;
-+				}
-+			}
-+		}
-+
-+		if (self->_priv->mixer_tracks != NULL)
-+			return TRUE;
-+		else {
-+			gst_element_set_state (GST_ELEMENT (self->_priv->mixer), GST_STATE_NULL);
-+			gst_object_unref (self->_priv->mixer);
-+		}
-+	}
-+
-+	/* Go through all elements of a certain class and check whether
-+	 * they implement a mixer. If so, walk through the tracks and look
-+	 * for first one named "volume".
-+	 *
-+	 * We should probably do something intelligent if we don't find an
-+	 * appropriate mixer/track.  But now we do something stupid...
-+	 * everything just becomes a no-op.
-+	 */
-+	mixer_list = gst_audio_default_registry_mixer_filter (_acme_set_mixer,
-+			TRUE,
-+			self);
-+
-+	if (mixer_list == NULL)
-+		return FALSE;
-+
-+	/* do not unref the mixer as we keep the ref for self->priv->mixer */
-+	g_list_free (mixer_list);
-+
-+	return TRUE;
-+}
-+
-+static void
-+acme_volume_close (AcmeVolume *self)
-+{
-+	self->_priv->timer_id = g_timeout_add_seconds (TIMEOUT,
-+			(GSourceFunc) acme_volume_close_real, self);
-+}
-+
-+static void
-+acme_volume_init (AcmeVolume *self)
-+{
-+	self->_priv = ACME_VOLUME_GET_PRIVATE (self);
-+	self->_priv->gconf_client = gconf_client_get_default ();
-+}
-+
-+static void
-+acme_volume_class_init (AcmeVolumeClass *klass)
-+{
-+	G_OBJECT_CLASS (klass)->finalize = acme_volume_finalize;
-+
-+	gst_init (NULL, NULL);
-+
-+	g_type_class_add_private (klass, sizeof (AcmeVolumePrivate));
-+}
-+
-+/* acme_volume_new
-+ * @return A singleton instance of type AcmeVolume
-+ */
-+AcmeVolume *
-+acme_volume_new (void)
-+{
-+	if (acme_volume_object == NULL) {
-+		acme_volume_object = g_object_new (ACME_TYPE_VOLUME, NULL);
-+		return ACME_VOLUME(acme_volume_object);
-+	}
-+	g_object_ref(acme_volume_object);
-+	return ACME_VOLUME(acme_volume_object);
-+}
-+
-diff -Nur gnome-settings-daemon-2.29.91.1.orig/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h gnome-settings-daemon-2.29.91.1/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h
---- gnome-settings-daemon-2.29.91.1.orig/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h	1970-01-01 02:00:00.000000000 +0200
-+++ gnome-settings-daemon-2.29.91.1/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h	2010-02-25 18:18:35.000000000 +0200
-@@ -0,0 +1,56 @@
-+/* acme-volume.h
-+
-+   Copyright (C) 2002, 2003 Bastien Nocera
-+   Copyright (C) 2004 Novell, Inc.
-+   Copyright (C) 2009 PERIER Romain <mrpouet@tuxfamily.org>
-+
-+   The Gnome Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   The Gnome Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+
-+   Author: Bastien Nocera <hadess@hadess.net>
-+           Jon Trowbridge <trow@ximian.com>
-+ */
-+
-+#include <glib-object.h>
-+
-+#define ACME_TYPE_VOLUME                        (acme_volume_get_type ())
-+#define ACME_VOLUME(obj)		        (G_TYPE_CHECK_INSTANCE_CAST ((obj), ACME_TYPE_VOLUME, AcmeVolume))
-+#define ACME_VOLUME_CLASS(klass)	        (G_TYPE_CHECK_CLASS_CAST ((klass),  ACME_TYPE_VOLUME, AcmeVolumeClass))
-+#define ACME_IS_VOLUME(obj)	                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ACME_TYPE_VOLUME))
-+#define ACME_VOLUME_GET_CLASS(obj)	        (G_TYPE_INSTANCE_GET_CLASS ((obj), ACME_TYPE_VOLUME, AcmeVolumeClass))
-+
-+typedef struct AcmeVolume AcmeVolume;
-+typedef struct AcmeVolumeClass AcmeVolumeClass;
-+typedef struct AcmeVolumePrivate AcmeVolumePrivate;
-+
-+struct AcmeVolume {
-+	GObject parent;
-+	AcmeVolumePrivate *_priv;
-+};
-+
-+struct AcmeVolumeClass {
-+	GObjectClass parent;
-+};
-+
-+GType       acme_volume_get_type      (void);
-+AcmeVolume *acme_volume_new           (void);
-+void        acme_volume_set_mute      (AcmeVolume *self, gboolean val);
-+void        acme_volume_mute_toggle   (AcmeVolume *self);
-+gboolean    acme_volume_get_mute      (AcmeVolume *self);
-+void        acme_volume_set_volume    (AcmeVolume *self, gint val);
-+gint        acme_volume_get_volume    (AcmeVolume *self);
-+gint        acme_volume_get_threshold (AcmeVolume *self);
-+
-+
-diff -Nur gnome-settings-daemon-2.29.91.1.orig/plugins/media-keys/cut-n-paste/Makefile.am gnome-settings-daemon-2.29.91.1/plugins/media-keys/cut-n-paste/Makefile.am
---- gnome-settings-daemon-2.29.91.1.orig/plugins/media-keys/cut-n-paste/Makefile.am	2009-08-19 19:16:15.000000000 +0300
-+++ gnome-settings-daemon-2.29.91.1/plugins/media-keys/cut-n-paste/Makefile.am	2010-02-25 18:18:35.000000000 +0200
-@@ -4,16 +4,24 @@
- 
- INCLUDES =					\
- 	$(WARN_CFLAGS)				\
--	$(VOLUME_CONTROL_CFLAGS)		\
--	$(PULSE_CFLAGS)				\
- 	$(NULL)
- 
- libgvc_la_LIBADD =		\
--	$(VOLUME_CONTROL_LIBS)	\
--	$(PULSE_LIBS)		\
- 	$(NULL)
- 
- libgvc_la_SOURCES =			\
-+	$(NULL)
-+
-+if HAVE_PULSE
-+INCLUDES +=					\
-+	$(VOLUME_CONTROL_CFLAGS)		\
-+	$(PULSE_CFLAGS)
-+
-+libgvc_la_LIBADD +=		\
-+	$(VOLUME_CONTROL_LIBS)	\
-+	$(PULSE_LIBS)
-+
-+libgvc_la_SOURCES +=			\
- 	gvc-mixer-stream.h		\
- 	gvc-mixer-stream.c		\
- 	gvc-channel-map.h		\
-@@ -31,8 +39,22 @@
- 	gvc-mixer-event-role.h		\
- 	gvc-mixer-event-role.c		\
- 	gvc-mixer-control.h		\
--	gvc-mixer-control.c		\
--	$(NULL)
-+	gvc-mixer-control.c
-+endif
-+
-+if HAVE_GSTREAMER
-+INCLUDES +=					\
-+	$(SETTINGS_PLUGIN_CFLAGS)		\
-+	$(AM_CFLAGS)				\
-+	$(GST_CFLAGS)
-+
-+libgvc_la_LIBADD +=		\
-+	$(GST_LIBS)
-+
-+libgvc_la_SOURCES +=			\
-+	gvc-gstreamer-acme-vol.c	\
-+	gvc-gstreamer-acme-vol.h
-+endif
- 
- MAINTAINERCLEANFILES =                  \
-         *~                              \
-diff -Nur gnome-settings-daemon-2.29.91.1.orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-2.29.91.1/plugins/media-keys/gsd-media-keys-manager.c
---- gnome-settings-daemon-2.29.91.1.orig/plugins/media-keys/gsd-media-keys-manager.c	2010-02-17 00:40:19.000000000 +0200
-+++ gnome-settings-daemon-2.29.91.1/plugins/media-keys/gsd-media-keys-manager.c	2010-02-25 18:21:00.000000000 +0200
-@@ -53,6 +53,8 @@
- #ifdef HAVE_PULSE
- #include <canberra-gtk.h>
- #include "gvc-mixer-control.h"
-+#elif defined(HAVE_GSTREAMER)
-+#include "gvc-gstreamer-acme-vol.h"
- #endif /* HAVE_PULSE */
- 
- #define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
-@@ -84,6 +86,8 @@
-         /* Volume bits */
-         GvcMixerControl *volume;
-         GvcMixerStream  *stream;
-+#elif defined(HAVE_GSTREAMER)
-+        AcmeVolume      *volume;
- #endif /* HAVE_PULSE */
-         GtkWidget       *dialog;
-         GConfClient     *conf_client;
-@@ -647,7 +651,9 @@
-                                 CA_PROP_APPLICATION_ID, "org.gnome.VolumeControl",
-                                 NULL);
- }
-+#endif /* HAVE_PULSE */
- 
-+#if defined(HAVE_PULSE) || defined(HAVE_GSTREAMER)
- static void
- do_sound_action (GsdMediaKeysManager *manager,
-                  int                  type)
-@@ -656,7 +662,11 @@
-         guint vol, norm_vol_step;
-         int vol_step;
- 
-+#ifdef HAVE_PULSE
-         if (manager->priv->stream == NULL)
-+#else
-+        if (manager->priv->volume == NULL)
-+#endif
-                 return;
- 
-         vol_step = gconf_client_get_int (manager->priv->conf_client,
-@@ -666,18 +676,34 @@
-         if (vol_step <= 0 || vol_step > 100)
-                 vol_step = VOLUME_STEP;
- 
-+#ifdef HAVE_PULSE
-         norm_vol_step = PA_VOLUME_NORM * vol_step / 100;
- 
-         /* FIXME: this is racy */
-         vol = gvc_mixer_stream_get_volume (manager->priv->stream);
-         muted = gvc_mixer_stream_get_is_muted (manager->priv->stream);
- 
-+#else
-+        if (vol_step > 0) {
-+                gint threshold = acme_volume_get_threshold (manager->priv->volume);
-+                if (vol_step < threshold)
-+                        vol_step = threshold;
-+                g_debug ("Using volume step of %d", vol_step);
-+        }
-+        vol = acme_volume_get_volume (manager->priv->volume);
-+        muted = acme_volume_get_mute (manager->priv->volume);
-+#endif
-         switch (type) {
-         case MUTE_KEY:
-+#ifdef HAVE_PULSE
-                 muted = !muted;
-                 gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
-+#else
-+                acme_volume_mute_toggle (manager->priv->volume);
-+#endif
-                 break;
-         case VOLUME_DOWN_KEY:
-+#ifdef HAVE_PULSE
-                 if (!muted && (vol <= norm_vol_step)) {
-                         muted = !muted;
-                         vol = 0;
-@@ -689,11 +715,17 @@
-                         if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE)
-                                 gvc_mixer_stream_push_volume (manager->priv->stream);
-                 }
-+#else
-+                if (!muted && (vol <= vol_step))
-+                        acme_volume_mute_toggle (manager->priv->volume);
-+                acme_volume_set_volume (manager->priv->volume, vol - vol_step);
-+#endif
-                 break;
-         case VOLUME_UP_KEY:
-                 if (muted) {
-                         muted = !muted;
-                         if (vol == 0) {
-+#ifdef HAVE_PULSE
-                                vol = vol + norm_vol_step;
-                                gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
-                                if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE)
-@@ -701,7 +733,15 @@
-                         } else {
-                                 gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
-                         }
-+#else
-+                                /* We need to unmute otherwise vol is blocked (and muted) */
-+                                acme_volume_set_mute   (manager->priv->volume, FALSE);
-+                        }
-+                        acme_volume_set_volume (manager->priv->volume, vol + vol_step);
-+                        
-+#endif
-                 } else {
-+#ifdef HAVE_PULSE
-                         if (vol < MAX_VOLUME) {
-                                 if (vol + norm_vol_step >= MAX_VOLUME) {
-                                         vol = MAX_VOLUME;
-@@ -711,13 +751,35 @@
-                                 if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE)
-                                         gvc_mixer_stream_push_volume (manager->priv->stream);
-                         }
-+#else
-+                        acme_volume_set_volume (manager->priv->volume, vol + vol_step);
-+#endif
-                 }
-                 break;
-         }
- 
-+#ifdef HAVE_PULSE
-         update_dialog (manager, vol, muted);
-+#else
-+        muted = acme_volume_get_mute (manager->priv->volume);
-+        vol = acme_volume_get_volume (manager->priv->volume);
-+
-+        /* FIXME: AcmeVolume should probably emit signals
-+           instead of doing it like this */
-+        dialog_init (manager);
-+        gsd_media_keys_window_set_volume_muted (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
-+                                                muted);
-+        gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
-+                                                vol);
-+        gsd_media_keys_window_set_action (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
-+                                          GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
-+        dialog_show (manager);
-+#endif /* HAVE_PULSE */
- }
- 
-+#endif /* defined(HAVE_PULSE) || defined(HAVE_GSTREAMER) */
-+
-+#ifdef HAVE_PULSE
- static void
- update_default_sink (GsdMediaKeysManager *manager)
- {
-@@ -879,9 +941,9 @@
-         case MUTE_KEY:
-         case VOLUME_DOWN_KEY:
-         case VOLUME_UP_KEY:
--#ifdef HAVE_PULSE
-+#if defined(HAVE_PULSE) || defined(HAVE_GSTREAMER)
-                 do_sound_action (manager, type);
--#endif /* HAVE_PULSE */
-+#endif /* HAVE_PULSE || HAVE_GSTREAMER */
-                 break;
-         case POWER_KEY:
-                 do_exit_action (manager);
-@@ -1081,6 +1143,10 @@
-         gvc_mixer_control_open (manager->priv->volume);
- 
-         gnome_settings_profile_end ("gvc_mixer_control_new");
-+#elif defined(HAVE_GSTREAMER)
-+        gnome_settings_profile_start ("acme_volume_new");
-+        manager->priv->volume = acme_volume_new ();
-+        gnome_settings_profile_end ("acme_volume_new");
- #endif /* HAVE_PULSE */
-         g_idle_add ((GSourceFunc) start_media_keys_idle_cb, manager);
- 
-@@ -1153,6 +1219,7 @@
-                 g_object_unref (priv->stream);
-                 priv->stream = NULL;
-         }
-+#elif defined(HAVE_GSTREAMER)
- 
-         if (priv->volume) {
-                 g_object_unref (priv->volume);
-diff -Nur gnome-settings-daemon-2.29.91.1.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-2.29.91.1/plugins/media-keys/Makefile.am
---- gnome-settings-daemon-2.29.91.1.orig/plugins/media-keys/Makefile.am	2010-02-17 00:40:19.000000000 +0200
-+++ gnome-settings-daemon-2.29.91.1/plugins/media-keys/Makefile.am	2010-02-25 18:18:35.000000000 +0200
-@@ -3,13 +3,8 @@
- 
- NULL =
- 
--SUBDIRS =
--plugin_LTLIBRARIES =
--
--if HAVE_PULSE
--SUBDIRS += cut-n-paste
--plugin_LTLIBRARIES += libmedia-keys.la
--endif
-+SUBDIRS = cut-n-paste
-+plugin_LTLIBRARIES = libmedia-keys.la
- 
- BUILT_SOURCES = 			\
- 	gsd-media-keys-manager-glue.h	\
-@@ -100,16 +95,14 @@
- 
- libmedia_keys_la_LIBADD  = 		\
- 	$(top_builddir)/plugins/common/libcommon.la			\
--	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
-+	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la        \
- 	$(SETTINGS_PLUGIN_LIBS)						\
- 	$(XF86MISC_LIBS)
- 
- plugin_in_files = 		\
- 	media-keys.gnome-settings-plugin.in
- 
--if HAVE_PULSE
- plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
--endif
- 
- noinst_PROGRAMS =				\
- 	test-media-keys				\
-@@ -173,9 +166,7 @@
- 	$(XF86MISC_LIBS)			\
- 	$(GST_LIBS)
- 
--if HAVE_PULSE
- test_media_keys_LDADD += $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la
--endif
- 
- gtkbuilderdir = $(pkgdatadir)
- gtkbuilder_DATA =	\
diff --git a/extra/gnome-settings-daemon/gstreamer-volume-2.30.patch b/extra/gnome-settings-daemon/gstreamer-volume-2.30.patch
deleted file mode 100644
index 1169df1ed..000000000
--- a/extra/gnome-settings-daemon/gstreamer-volume-2.30.patch
+++ /dev/null
@@ -1,861 +0,0 @@
-diff -Nur gnome-settings-daemon-2.30.0.orig/configure.ac gnome-settings-daemon-2.30.0/configure.ac
---- gnome-settings-daemon-2.30.0.orig/configure.ac	2010-03-29 17:03:47.000000000 +0300
-+++ gnome-settings-daemon-2.30.0/configure.ac	2010-03-29 21:35:17.974333715 +0300
-@@ -251,6 +251,48 @@
- AC_SUBST(PULSE_CFLAGS)
- AC_SUBST(PULSE_LIBS)
- 
-+dnl ==============================================
-+dnl GStreamer section
-+dnl ==============================================
-+GST_MAJORMINOR=auto
-+
-+AC_ARG_ENABLE(gstreamer,
-+AC_HELP_STRING([--enable-gstreamer],[use gstreamer if available (and optionally specify a version)]),
-+[case "${enableval}" in
-+ yes) ENABLE_GSTREAMER=yes ;;
-+ 0.10) ENABLE_GSTREAMER=yes && GST_MAJORMINOR=0.10 ;;
-+ no)  ENABLE_GSTREAMER=no ;;
-+ *) AC_MSG_ERROR([
-+                  *** Bad value ${enableval} for --enable-gstreamer
-+                  *** Please use one of the following:
-+                  ***    --enable-gstreamer=0.10
-+               ]) ;;
-+esac],
-+[ENABLE_GSTREAMER=yes]) dnl Default value
-+
-+have_gstreamer=no
-+if test "x$ENABLE_GSTREAMER" = "xyes"; then
-+   GST_REQS=0.10.1.2
-+   PKGS="gstreamer-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GST_REQS"
-+
-+   PKG_CHECK_MODULES(GST, $PKGS, have_gstreamer=yes,
-+                     AC_MSG_RESULT([no]))
-+
-+   if test "x$have_pulse" = "xtrue"; then
-+      AC_MSG_ERROR([*** GStreamer & Pulseaudio both are selected ***])
-+   fi
-+
-+   if test "x$have_gstreamer" = "xyes"; then
-+      GST_LIBS="$GST_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
-+      AC_DEFINE(HAVE_GSTREAMER,1,[enable gstreamer])
-+   fi
-+else
-+   AC_MSG_NOTICE([*** GStreamer support disabled ***])
-+fi
-+AM_CONDITIONAL(HAVE_GSTREAMER, test "x$have_gstreamer" = "xyes")
-+AC_SUBST(GST_LIBS)
-+AC_SUBST(GST_CFLAGS)
-+
- # ---------------------------------------------------------------------------
- # Enable Profiling
- # ---------------------------------------------------------------------------
-@@ -389,6 +431,7 @@
-         dbus-1 system.d dir:      ${DBUS_SYS_DIR}
- 
-         Libnotify support:        ${have_libnotify}
-+        GStreamer support:        ${have_gstreamer}
-         PulseAudio support:       ${have_pulse}
-         Profiling support:        ${enable_profiling}
- "
-diff -Nur gnome-settings-daemon-2.30.0.orig/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c gnome-settings-daemon-2.30.0/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c
---- gnome-settings-daemon-2.30.0.orig/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c	1970-01-01 02:00:00.000000000 +0200
-+++ gnome-settings-daemon-2.30.0/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c	2010-03-29 21:35:17.977471980 +0300
-@@ -0,0 +1,402 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-+
-+/* acme-volume.c
-+
-+   Copyright (C) 2002, 2003 Bastien Nocera
-+   Copyright (C) 2004 Novell, Inc.
-+   Copyright (C) 2009 PERIER Romain <mrpouet@tuxfamily.org>
-+
-+   The Gnome Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   The Gnome Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+
-+   Author: Bastien Nocera <hadess@hadess.net>
-+           Jon Trowbridge <trow@ximian.com>
-+*/
-+
-+#include "config.h"
-+#include "gvc-gstreamer-acme-vol.h"
-+
-+#include <gst/gst.h>
-+#include <gst/audio/mixerutils.h>
-+#include <gst/interfaces/mixer.h>
-+#include <gst/interfaces/propertyprobe.h>
-+
-+#include <gconf/gconf-client.h>
-+
-+#include <string.h>
-+
-+#define TIMEOUT	4
-+
-+#define DEFAULT_MIXER_DEVICE_KEY   "/desktop/gnome/sound/default_mixer_device"
-+#define DEFAULT_MIXER_TRACKS_KEY   "/desktop/gnome/sound/default_mixer_tracks"
-+
-+#define ACME_VOLUME_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ACME_TYPE_VOLUME, AcmeVolumePrivate))
-+
-+struct AcmeVolumePrivate {
-+	GstMixer     *mixer;
-+	GList        *mixer_tracks;
-+	guint         timer_id;
-+	gdouble       volume;
-+	gboolean      mute;
-+	GConfClient  *gconf_client;
-+};
-+
-+G_DEFINE_TYPE (AcmeVolume, acme_volume, G_TYPE_OBJECT)
-+
-+static gboolean acme_volume_open  (AcmeVolume *acme);
-+static void     acme_volume_close (AcmeVolume *acme);
-+static gboolean acme_volume_close_real (AcmeVolume *self);
-+
-+static gpointer acme_volume_object = NULL;
-+
-+static void
-+acme_volume_finalize (GObject *object)
-+{
-+	AcmeVolume *self;
-+
-+	g_return_if_fail (object != NULL);
-+	g_return_if_fail (ACME_IS_VOLUME (object));
-+
-+	self = ACME_VOLUME (object);
-+
-+	if (self->_priv->timer_id != 0)
-+		g_source_remove (self->_priv->timer_id);
-+	acme_volume_close_real (self);
-+
-+	if (self->_priv->gconf_client != NULL) {
-+		g_object_unref (self->_priv->gconf_client);
-+		self->_priv->gconf_client = NULL;
-+	}
-+
-+	G_OBJECT_CLASS (acme_volume_parent_class)->finalize (object);
-+}
-+
-+void
-+acme_volume_set_mute (AcmeVolume *self, gboolean val)
-+{
-+	GList *t;
-+
-+	g_return_if_fail(ACME_IS_VOLUME(self));
-+	g_return_if_fail(acme_volume_open(self));
-+
-+	for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) {
-+		GstMixerTrack *track = GST_MIXER_TRACK (t->data);
-+		gst_mixer_set_mute (self->_priv->mixer, track, val);
-+	}
-+	self->_priv->mute = val;
-+	acme_volume_close (self);
-+}
-+
-+static void
-+update_state (AcmeVolume * self)
-+{
-+	gint *volumes, n;
-+	gdouble vol = 0;
-+	GstMixerTrack *track = GST_MIXER_TRACK (self->_priv->mixer_tracks->data);
-+
-+	/* update mixer by getting volume */
-+	volumes = g_new0 (gint, track->num_channels);
-+	gst_mixer_get_volume (self->_priv->mixer, track, volumes);
-+	for (n = 0; n < track->num_channels; n++)
-+		vol += volumes[n];
-+	g_free (volumes);
-+	vol /= track->num_channels;
-+	vol = 100 * vol / (track->max_volume - track->min_volume);
-+
-+	/* update mute flag, and volume if not muted */
-+	if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE))
-+		self->_priv->mute = TRUE;
-+	self->_priv->volume = vol;
-+}
-+
-+gboolean
-+acme_volume_get_mute (AcmeVolume *self)
-+{
-+	g_return_val_if_fail(acme_volume_open(self), FALSE);
-+
-+	update_state (self);
-+	acme_volume_close (self);
-+
-+	return self->_priv->mute;
-+}
-+
-+gint
-+acme_volume_get_volume (AcmeVolume *self)
-+{
-+
-+	g_return_val_if_fail(acme_volume_open(self), 0);
-+
-+	update_state (self);
-+
-+	acme_volume_close (self);
-+	
-+	return (gint) (self->_priv->volume + 0.5);
-+}
-+
-+void
-+acme_volume_set_volume (AcmeVolume *self, gint val)
-+{
-+	GList *t;
-+
-+	g_return_if_fail(acme_volume_open(self));
-+
-+	val = CLAMP (val, 0, 100);
-+
-+	for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) {
-+		GstMixerTrack *track = GST_MIXER_TRACK (t->data);
-+		gint *volumes, n;
-+		gdouble scale = (track->max_volume - track->min_volume) / 100.0;
-+		gint vol = (gint) (val * scale + track->min_volume + 0.5);
-+
-+		volumes = g_new (gint, track->num_channels);
-+		for (n = 0; n < track->num_channels; n++)
-+			volumes[n] = vol;
-+		gst_mixer_set_volume (self->_priv->mixer, track, volumes);
-+		g_free (volumes);
-+	}
-+
-+	/* update state */
-+	self->_priv->volume = val;
-+
-+	acme_volume_close (self);
-+}
-+
-+void
-+acme_volume_mute_toggle (AcmeVolume *self)
-+{
-+	gboolean muted;
-+
-+	g_return_if_fail (self != NULL);
-+	g_return_if_fail (ACME_IS_VOLUME(self));
-+
-+	muted = acme_volume_get_mute(self);
-+	acme_volume_set_mute(self, !muted);
-+}
-+
-+gint
-+acme_volume_get_threshold (AcmeVolume *self)
-+{
-+	GList *t;
-+	gint steps = 101;
-+
-+	g_return_val_if_fail(acme_volume_open(self), 1);
-+
-+	for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) {
-+		GstMixerTrack *track = GST_MIXER_TRACK (t->data);
-+		gint track_steps = track->max_volume - track->min_volume;
-+		if (track_steps > 0 && track_steps < steps)
-+			steps = track_steps;
-+	}
-+
-+	acme_volume_close (self);
-+
-+	return 100 / steps + 1;
-+}
-+
-+static gboolean
-+acme_volume_close_real (AcmeVolume *self)
-+{
-+	if (self->_priv->mixer != NULL)
-+	{
-+		gst_element_set_state (GST_ELEMENT (self->_priv->mixer), GST_STATE_NULL);
-+		gst_object_unref (GST_OBJECT (self->_priv->mixer));
-+		g_list_foreach (self->_priv->mixer_tracks, (GFunc) g_object_unref, NULL);
-+		g_list_free (self->_priv->mixer_tracks);
-+		self->_priv->mixer = NULL;
-+		self->_priv->mixer_tracks = NULL;
-+	}
-+
-+	self->_priv->timer_id = 0;
-+	return FALSE;
-+}
-+
-+/*
-+ * _acme_set_mixer
-+ * @mixer  A pointer to mixer element
-+ * @data   A pointer to user data (AcmeVolume instance to be modified)
-+ * @return A gboolean indicating success if Master track was found, failed otherwises.
-+ */
-+static gboolean
-+_acme_set_mixer(GstMixer *mixer, gpointer user_data)
-+{
-+	const GList *tracks;
-+
-+	for (tracks = gst_mixer_list_tracks (mixer); tracks != NULL; tracks = tracks->next) {
-+		GstMixerTrack *track = GST_MIXER_TRACK (tracks->data);
-+
-+		if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MASTER)) {
-+			AcmeVolume *self;
-+
-+			self = ACME_VOLUME (user_data);
-+
-+			self->_priv->mixer = mixer;
-+			self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track));
-+			return TRUE;
-+		}
-+
-+		continue;
-+	}
-+
-+	return FALSE;
-+}
-+
-+/* This is a modified version of code from gnome-media's gst-mixer */
-+static gboolean
-+acme_volume_open (AcmeVolume *self)
-+{
-+	gchar *mixer_device, **factory_and_device = NULL;
-+	GList *mixer_list;
-+
-+	if (self->_priv->timer_id != 0) {
-+		g_source_remove (self->_priv->timer_id);
-+		self->_priv->timer_id = 0;
-+		return TRUE;
-+	}
-+
-+	mixer_device = gconf_client_get_string (self->_priv->gconf_client, DEFAULT_MIXER_DEVICE_KEY, NULL);
-+	if (mixer_device != NULL)
-+		factory_and_device = g_strsplit (mixer_device, ":", 2);
-+
-+	if (factory_and_device != NULL && factory_and_device[0] != NULL) {
-+		GstElement *element;
-+
-+		element = gst_element_factory_make (factory_and_device[0], NULL);
-+
-+		if (element != NULL) {
-+			if (factory_and_device[1] != NULL &&
-+			    g_object_class_find_property (G_OBJECT_GET_CLASS (element), "device"))
-+				g_object_set (G_OBJECT (element), "device", factory_and_device[1], NULL);
-+			gst_element_set_state (element, GST_STATE_READY);
-+
-+			if (GST_IS_MIXER (element))
-+				self->_priv->mixer = GST_MIXER (element);
-+			else {
-+				gst_element_set_state (element, GST_STATE_NULL);
-+				gst_object_unref (element);
-+			}
-+		}
-+	}
-+
-+	g_free (mixer_device);
-+	g_strfreev (factory_and_device);
-+
-+	if (self->_priv->mixer != NULL) {
-+		const GList *m;
-+		GSList *tracks, *t;
-+		GError *error = NULL;
-+
-+		/* Try to use tracks saved in GConf 
-+		   Note: errors need to be treated , for example if the user set a non type list for this key
-+		   or if the elements type_list are not "matched" */
-+		tracks = gconf_client_get_list (self->_priv->gconf_client, DEFAULT_MIXER_TRACKS_KEY, 
-+						GCONF_VALUE_STRING, &error);
-+
-+		if (error) {
-+			g_warning("ERROR: %s\n", error->message);
-+			g_error_free(error);
-+		}
-+
-+		/* We use these tracks ONLY if they are supported on the system with the following mixer */
-+		for (m = gst_mixer_list_tracks (self->_priv->mixer); m != NULL; m = m->next) {
-+			GstMixerTrack *track = GST_MIXER_TRACK (m->data);
-+
-+			for (t = tracks; t != NULL; t = t->next)
-+				if (!strcmp (t->data, track->label))
-+					self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track));
-+
-+		}
-+
-+		g_slist_foreach (tracks, (GFunc)g_free, NULL);
-+		g_slist_free (tracks);
-+
-+		/* If no track stored in GConf is avaiable try to use Master track */
-+		if (self->_priv->mixer_tracks == NULL) {
-+			for (m = gst_mixer_list_tracks (self->_priv->mixer); m != NULL; m = m->next) {
-+				GstMixerTrack *track = GST_MIXER_TRACK (m->data);
-+
-+				if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MASTER)) {
-+					self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track));
-+					break;
-+				}
-+			}
-+		}
-+
-+		if (self->_priv->mixer_tracks != NULL)
-+			return TRUE;
-+		else {
-+			gst_element_set_state (GST_ELEMENT (self->_priv->mixer), GST_STATE_NULL);
-+			gst_object_unref (self->_priv->mixer);
-+		}
-+	}
-+
-+	/* Go through all elements of a certain class and check whether
-+	 * they implement a mixer. If so, walk through the tracks and look
-+	 * for first one named "volume".
-+	 *
-+	 * We should probably do something intelligent if we don't find an
-+	 * appropriate mixer/track.  But now we do something stupid...
-+	 * everything just becomes a no-op.
-+	 */
-+	mixer_list = gst_audio_default_registry_mixer_filter (_acme_set_mixer,
-+			TRUE,
-+			self);
-+
-+	if (mixer_list == NULL)
-+		return FALSE;
-+
-+	/* do not unref the mixer as we keep the ref for self->priv->mixer */
-+	g_list_free (mixer_list);
-+
-+	return TRUE;
-+}
-+
-+static void
-+acme_volume_close (AcmeVolume *self)
-+{
-+	self->_priv->timer_id = g_timeout_add_seconds (TIMEOUT,
-+			(GSourceFunc) acme_volume_close_real, self);
-+}
-+
-+static void
-+acme_volume_init (AcmeVolume *self)
-+{
-+	self->_priv = ACME_VOLUME_GET_PRIVATE (self);
-+	self->_priv->gconf_client = gconf_client_get_default ();
-+}
-+
-+static void
-+acme_volume_class_init (AcmeVolumeClass *klass)
-+{
-+	G_OBJECT_CLASS (klass)->finalize = acme_volume_finalize;
-+
-+	gst_init (NULL, NULL);
-+
-+	g_type_class_add_private (klass, sizeof (AcmeVolumePrivate));
-+}
-+
-+/* acme_volume_new
-+ * @return A singleton instance of type AcmeVolume
-+ */
-+AcmeVolume *
-+acme_volume_new (void)
-+{
-+	if (acme_volume_object == NULL) {
-+		acme_volume_object = g_object_new (ACME_TYPE_VOLUME, NULL);
-+		return ACME_VOLUME(acme_volume_object);
-+	}
-+	g_object_ref(acme_volume_object);
-+	return ACME_VOLUME(acme_volume_object);
-+}
-+
-diff -Nur gnome-settings-daemon-2.30.0.orig/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h gnome-settings-daemon-2.30.0/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h
---- gnome-settings-daemon-2.30.0.orig/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h	1970-01-01 02:00:00.000000000 +0200
-+++ gnome-settings-daemon-2.30.0/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h	2010-03-29 21:35:17.977471980 +0300
-@@ -0,0 +1,56 @@
-+/* acme-volume.h
-+
-+   Copyright (C) 2002, 2003 Bastien Nocera
-+   Copyright (C) 2004 Novell, Inc.
-+   Copyright (C) 2009 PERIER Romain <mrpouet@tuxfamily.org>
-+
-+   The Gnome Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   The Gnome Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+
-+   Author: Bastien Nocera <hadess@hadess.net>
-+           Jon Trowbridge <trow@ximian.com>
-+ */
-+
-+#include <glib-object.h>
-+
-+#define ACME_TYPE_VOLUME                        (acme_volume_get_type ())
-+#define ACME_VOLUME(obj)		        (G_TYPE_CHECK_INSTANCE_CAST ((obj), ACME_TYPE_VOLUME, AcmeVolume))
-+#define ACME_VOLUME_CLASS(klass)	        (G_TYPE_CHECK_CLASS_CAST ((klass),  ACME_TYPE_VOLUME, AcmeVolumeClass))
-+#define ACME_IS_VOLUME(obj)	                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ACME_TYPE_VOLUME))
-+#define ACME_VOLUME_GET_CLASS(obj)	        (G_TYPE_INSTANCE_GET_CLASS ((obj), ACME_TYPE_VOLUME, AcmeVolumeClass))
-+
-+typedef struct AcmeVolume AcmeVolume;
-+typedef struct AcmeVolumeClass AcmeVolumeClass;
-+typedef struct AcmeVolumePrivate AcmeVolumePrivate;
-+
-+struct AcmeVolume {
-+	GObject parent;
-+	AcmeVolumePrivate *_priv;
-+};
-+
-+struct AcmeVolumeClass {
-+	GObjectClass parent;
-+};
-+
-+GType       acme_volume_get_type      (void);
-+AcmeVolume *acme_volume_new           (void);
-+void        acme_volume_set_mute      (AcmeVolume *self, gboolean val);
-+void        acme_volume_mute_toggle   (AcmeVolume *self);
-+gboolean    acme_volume_get_mute      (AcmeVolume *self);
-+void        acme_volume_set_volume    (AcmeVolume *self, gint val);
-+gint        acme_volume_get_volume    (AcmeVolume *self);
-+gint        acme_volume_get_threshold (AcmeVolume *self);
-+
-+
-diff -Nur gnome-settings-daemon-2.30.0.orig/plugins/media-keys/cut-n-paste/Makefile.am gnome-settings-daemon-2.30.0/plugins/media-keys/cut-n-paste/Makefile.am
---- gnome-settings-daemon-2.30.0.orig/plugins/media-keys/cut-n-paste/Makefile.am	2009-08-12 12:15:00.000000000 +0300
-+++ gnome-settings-daemon-2.30.0/plugins/media-keys/cut-n-paste/Makefile.am	2010-03-29 21:35:17.977471980 +0300
-@@ -4,16 +4,24 @@
- 
- INCLUDES =					\
- 	$(WARN_CFLAGS)				\
--	$(VOLUME_CONTROL_CFLAGS)		\
--	$(PULSE_CFLAGS)				\
- 	$(NULL)
- 
- libgvc_la_LIBADD =		\
--	$(VOLUME_CONTROL_LIBS)	\
--	$(PULSE_LIBS)		\
- 	$(NULL)
- 
- libgvc_la_SOURCES =			\
-+	$(NULL)
-+
-+if HAVE_PULSE
-+INCLUDES +=					\
-+	$(VOLUME_CONTROL_CFLAGS)		\
-+	$(PULSE_CFLAGS)
-+
-+libgvc_la_LIBADD +=		\
-+	$(VOLUME_CONTROL_LIBS)	\
-+	$(PULSE_LIBS)
-+
-+libgvc_la_SOURCES +=			\
- 	gvc-mixer-stream.h		\
- 	gvc-mixer-stream.c		\
- 	gvc-channel-map.h		\
-@@ -31,8 +39,22 @@
- 	gvc-mixer-event-role.h		\
- 	gvc-mixer-event-role.c		\
- 	gvc-mixer-control.h		\
--	gvc-mixer-control.c		\
--	$(NULL)
-+	gvc-mixer-control.c
-+endif
-+
-+if HAVE_GSTREAMER
-+INCLUDES +=					\
-+	$(SETTINGS_PLUGIN_CFLAGS)		\
-+	$(AM_CFLAGS)				\
-+	$(GST_CFLAGS)
-+
-+libgvc_la_LIBADD +=		\
-+	$(GST_LIBS)
-+
-+libgvc_la_SOURCES +=			\
-+	gvc-gstreamer-acme-vol.c	\
-+	gvc-gstreamer-acme-vol.h
-+endif
- 
- MAINTAINERCLEANFILES =                  \
-         *~                              \
-diff -Nur gnome-settings-daemon-2.30.0.orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-2.30.0/plugins/media-keys/gsd-media-keys-manager.c
---- gnome-settings-daemon-2.30.0.orig/plugins/media-keys/gsd-media-keys-manager.c	2010-03-29 11:15:04.000000000 +0300
-+++ gnome-settings-daemon-2.30.0/plugins/media-keys/gsd-media-keys-manager.c	2010-03-29 21:56:13.293985485 +0300
-@@ -53,6 +53,8 @@
- #ifdef HAVE_PULSE
- #include <canberra-gtk.h>
- #include "gvc-mixer-control.h"
-+#elif defined(HAVE_GSTREAMER)
-+#include "gvc-gstreamer-acme-vol.h"
- #endif /* HAVE_PULSE */
- 
- #define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
-@@ -78,11 +80,12 @@
-         /* Volume bits */
-         GvcMixerControl *volume;
-         GvcMixerStream  *stream;
-+#elif defined(HAVE_GSTREAMER)
-+        AcmeVolume      *volume;
- #endif /* HAVE_PULSE */
-         GtkWidget       *dialog;
-         GConfClient     *conf_client;
--        GVolumeMonitor  *volume_monitor;
--
-+	GVolumeMonitor  *volume_monitor;
-         /* Multihead stuff */
-         GdkScreen       *current_screen;
-         GSList          *screens;
-@@ -601,15 +604,15 @@
-                 if (score < SCORE_CAN_EJECT) {
-                         fav_drive = drive;
-                         score = SCORE_CAN_EJECT;
--                }
-+                }    
-                 if (g_drive_has_media (drive) == FALSE)
-                         continue;
-                 if (score < SCORE_HAS_MEDIA) {
-                         fav_drive = drive;
-                         score = SCORE_HAS_MEDIA;
-                         break;
--                }
--        }
-+                }    
-+        }    
- 
-         /* Show the dialogue */
-         dialog_init (manager);
-@@ -632,7 +635,7 @@
-                                       NULL, NULL,
-                                       (GAsyncReadyCallback) do_eject_action_cb,
-                                       manager);
--        g_object_unref (fav_drive);
-+        g_object_unref (fav_drive);        
- }
- 
- static void
-@@ -675,7 +678,9 @@
-                                         CA_PROP_APPLICATION_ID, "org.gnome.VolumeControl",
-                                         NULL);
- }
-+#endif /* HAVE_PULSE */
- 
-+#if defined(HAVE_PULSE) || defined(HAVE_GSTREAMER)
- static void
- do_sound_action (GsdMediaKeysManager *manager,
-                  int                  type)
-@@ -685,7 +690,11 @@
-         int vol_step;
-         gboolean sound_changed;
- 
-+#ifdef HAVE_PULSE
-         if (manager->priv->stream == NULL)
-+#else
-+        if (manager->priv->volume == NULL)
-+#endif
-                 return;
- 
-         vol_step = gconf_client_get_int (manager->priv->conf_client,
-@@ -695,6 +704,7 @@
-         if (vol_step <= 0 || vol_step > 100)
-                 vol_step = VOLUME_STEP;
- 
-+#ifdef HAVE_PULSE
-         norm_vol_step = PA_VOLUME_NORM * vol_step / 100;
- 
-         /* FIXME: this is racy */
-@@ -702,13 +712,28 @@
-         muted = gvc_mixer_stream_get_is_muted (manager->priv->stream);
-         sound_changed = FALSE;
- 
-+#else
-+        if (vol_step > 0) {
-+                gint threshold = acme_volume_get_threshold (manager->priv->volume);
-+                if (vol_step < threshold)
-+                        vol_step = threshold;
-+                g_debug ("Using volume step of %d", vol_step);
-+        }
-+        vol = acme_volume_get_volume (manager->priv->volume);
-+        muted = acme_volume_get_mute (manager->priv->volume);
-+#endif
-         switch (type) {
-         case MUTE_KEY:
-+#ifdef HAVE_PULSE
-                 muted = !muted;
-                 gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
-                 sound_changed = TRUE;
-+#else
-+                acme_volume_mute_toggle (manager->priv->volume);
-+#endif
-                 break;
-         case VOLUME_DOWN_KEY:
-+#ifdef HAVE_PULSE
-                 if (!muted && (vol <= norm_vol_step)) {
-                         muted = !muted;
-                         vol = 0;
-@@ -722,24 +747,37 @@
-                         if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE) {
-                                 gvc_mixer_stream_push_volume (manager->priv->stream);
-                                 sound_changed = TRUE;
--                        }
-                 }
-+#else
-+                if (!muted && (vol <= vol_step))
-+                        acme_volume_mute_toggle (manager->priv->volume);
-+                acme_volume_set_volume (manager->priv->volume, vol - vol_step);
-+#endif
-                 break;
-         case VOLUME_UP_KEY:
-                 if (muted) {
-                         muted = !muted;
-                         if (vol == 0) {
-+#ifdef HAVE_PULSE
-                                vol = vol + norm_vol_step;
-                                gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
-                                if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE) {
-                                         gvc_mixer_stream_push_volume (manager->priv->stream);
-                                         sound_changed = TRUE;
--                               }
-+                                }
-                         } else {
-                                 gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
-                                 sound_changed = TRUE;
-                         }
-+#else
-+                                /* We need to unmute otherwise vol is blocked (and muted) */
-+                                acme_volume_set_mute   (manager->priv->volume, FALSE);
-+                        }
-+                        acme_volume_set_volume (manager->priv->volume, vol + vol_step);
-+                        
-+#endif
-                 } else {
-+#ifdef HAVE_PULSE
-                         if (vol < MAX_VOLUME) {
-                                 if (vol + norm_vol_step >= MAX_VOLUME) {
-                                         vol = MAX_VOLUME;
-@@ -751,13 +789,35 @@
-                                         sound_changed = TRUE;
-                                 }
-                         }
-+#else
-+                        acme_volume_set_volume (manager->priv->volume, vol + vol_step);
-+#endif
-                 }
-                 break;
-         }
- 
-+#ifdef HAVE_PULSE
-         update_dialog (manager, vol, muted, sound_changed);
-+#else
-+        muted = acme_volume_get_mute (manager->priv->volume);
-+        vol = acme_volume_get_volume (manager->priv->volume);
-+
-+        /* FIXME: AcmeVolume should probably emit signals
-+           instead of doing it like this */
-+        dialog_init (manager);
-+        gsd_media_keys_window_set_volume_muted (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
-+                                                muted);
-+        gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
-+                                                vol);
-+        gsd_media_keys_window_set_action (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
-+                                          GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
-+        dialog_show (manager);
-+#endif /* HAVE_PULSE */
- }
- 
-+#endif /* defined(HAVE_PULSE) || defined(HAVE_GSTREAMER) */
-+
-+#ifdef HAVE_PULSE
- static void
- update_default_sink (GsdMediaKeysManager *manager)
- {
-@@ -919,9 +979,9 @@
-         case MUTE_KEY:
-         case VOLUME_DOWN_KEY:
-         case VOLUME_UP_KEY:
--#ifdef HAVE_PULSE
-+#if defined(HAVE_PULSE) || defined(HAVE_GSTREAMER)
-                 do_sound_action (manager, type);
--#endif /* HAVE_PULSE */
-+#endif /* HAVE_PULSE || HAVE_GSTREAMER */
-                 break;
-         case POWER_KEY:
-                 do_exit_action (manager);
-@@ -1064,7 +1124,7 @@
- 
-         g_debug ("Starting media_keys manager");
-         gnome_settings_profile_start (NULL);
--        manager->priv->volume_monitor = g_volume_monitor_get ();
-+        manager->priv->volume_monitor = g_volume_monitor_get();
-         manager->priv->conf_client = gconf_client_get_default ();
- 
-         gconf_client_add_dir (manager->priv->conf_client,
-@@ -1122,6 +1182,10 @@
-         gvc_mixer_control_open (manager->priv->volume);
- 
-         gnome_settings_profile_end ("gvc_mixer_control_new");
-+#elif defined(HAVE_GSTREAMER)
-+        gnome_settings_profile_start ("acme_volume_new");
-+        manager->priv->volume = acme_volume_new ();
-+        gnome_settings_profile_end ("acme_volume_new");
- #endif /* HAVE_PULSE */
-         g_idle_add ((GSourceFunc) start_media_keys_idle_cb, manager);
- 
-@@ -1199,6 +1263,7 @@
-                 g_object_unref (priv->stream);
-                 priv->stream = NULL;
-         }
-+#elif defined(HAVE_GSTREAMER)
- 
-         if (priv->volume) {
-                 g_object_unref (priv->volume);
-diff -Nur gnome-settings-daemon-2.30.0.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-2.30.0/plugins/media-keys/Makefile.am
---- gnome-settings-daemon-2.30.0.orig/plugins/media-keys/Makefile.am	2010-03-10 13:59:38.000000000 +0200
-+++ gnome-settings-daemon-2.30.0/plugins/media-keys/Makefile.am	2010-03-29 22:18:20.077410522 +0300
-@@ -3,13 +3,8 @@
- 
- NULL =
- 
--SUBDIRS =
--plugin_LTLIBRARIES =
--
--if HAVE_PULSE
--SUBDIRS += cut-n-paste
--plugin_LTLIBRARIES += libmedia-keys.la
--endif
-+SUBDIRS = cut-n-paste
-+plugin_LTLIBRARIES = libmedia-keys.la
- 
- BUILT_SOURCES = 			\
- 	gsd-media-keys-manager-glue.h	\
-@@ -100,7 +95,7 @@
- 
- libmedia_keys_la_LIBADD  = 		\
- 	$(top_builddir)/plugins/common/libcommon.la			\
--	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
-+	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la        \
- 	$(SETTINGS_PLUGIN_LIBS)						\
- 	$(XF86MISC_LIBS)						\
- 	-lm
-@@ -108,9 +103,7 @@
- plugin_in_files = 		\
- 	media-keys.gnome-settings-plugin.in
- 
--if HAVE_PULSE
- plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
--endif
- 
- noinst_PROGRAMS =				\
- 	test-media-keys				\
-@@ -176,9 +169,7 @@
- 	$(GST_LIBS)				\
- 	-lm
- 
--if HAVE_PULSE
- test_media_keys_LDADD += $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la
--endif
- 
- gtkbuilderdir = $(pkgdatadir)
- gtkbuilder_DATA =	\
diff --git a/extra/gnome-settings-daemon/gstreamer-volume.patch b/extra/gnome-settings-daemon/gstreamer-volume.patch
deleted file mode 100644
index 0a32dcd7d..000000000
--- a/extra/gnome-settings-daemon/gstreamer-volume.patch
+++ /dev/null
@@ -1,808 +0,0 @@
-diff -ruN gnome-settings-daemon-2.27.91/configure.ac gnome-settings-daemon-2.27.91.gst/configure.ac
---- gnome-settings-daemon-2.27.91/configure.ac	2009-08-24 12:20:55.000000000 +0200
-+++ gnome-settings-daemon-2.27.91.gst/configure.ac	2009-08-24 15:25:47.000000000 +0200
-@@ -257,6 +257,48 @@
- AC_SUBST(PULSE_CFLAGS)
- AC_SUBST(PULSE_LIBS)
- 
-+dnl ==============================================
-+dnl GStreamer section
-+dnl ==============================================
-+GST_MAJORMINOR=auto
-+
-+AC_ARG_ENABLE(gstreamer,
-+AC_HELP_STRING([--enable-gstreamer],[use gstreamer if available (and optionally specify a version)]),
-+[case "${enableval}" in
-+ yes) ENABLE_GSTREAMER=yes ;;
-+ 0.10) ENABLE_GSTREAMER=yes && GST_MAJORMINOR=0.10 ;;
-+ no)  ENABLE_GSTREAMER=no ;;
-+ *) AC_MSG_ERROR([
-+                  *** Bad value ${enableval} for --enable-gstreamer
-+                  *** Please use one of the following:
-+                  ***    --enable-gstreamer=0.10
-+               ]) ;;
-+esac],
-+[ENABLE_GSTREAMER=yes]) dnl Default value
-+
-+have_gstreamer=no
-+if test "x$ENABLE_GSTREAMER" = "xyes"; then
-+   GST_REQS=0.10.1.2
-+   PKGS="gstreamer-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GST_REQS"
-+
-+   PKG_CHECK_MODULES(GST, $PKGS, have_gstreamer=yes,
-+                     AC_MSG_RESULT([no]))
-+
-+   if test "x$have_pulse" = "xtrue"; then
-+      AC_MSG_ERROR([*** GStreamer & Pulseaudio both are selected ***])
-+   fi
-+
-+   if test "x$have_gstreamer" = "xyes"; then
-+      GST_LIBS="$GST_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
-+      AC_DEFINE(HAVE_GSTREAMER,1,[enable gstreamer])
-+   fi
-+else
-+   AC_MSG_NOTICE([*** GStreamer support disabled ***])
-+fi
-+AM_CONDITIONAL(HAVE_GSTREAMER, test "x$have_gstreamer" = "xyes")
-+AC_SUBST(GST_LIBS)
-+AC_SUBST(GST_CFLAGS)
-+
- # ---------------------------------------------------------------------------
- # Enable Profiling
- # ---------------------------------------------------------------------------
-@@ -395,6 +437,7 @@
-         dbus-1 system.d dir:      ${DBUS_SYS_DIR}
- 
-         Libnotify support:        ${have_libnotify}
-+        GStreamer support:        ${have_gstreamer}
-         PulseAudio support:       ${have_pulse}
-         Profiling support:        ${enable_profiling}
- "
-diff -ruN gnome-settings-daemon-2.27.91/plugins/media-keys/Makefile.am gnome-settings-daemon-2.27.91.gst/plugins/media-keys/Makefile.am
---- gnome-settings-daemon-2.27.91/plugins/media-keys/Makefile.am	2009-07-14 11:21:12.000000000 +0200
-+++ gnome-settings-daemon-2.27.91.gst/plugins/media-keys/Makefile.am	2009-08-24 15:25:47.000000000 +0200
-@@ -1,12 +1,7 @@
- NULL =
- 
--SUBDIRS =
--plugin_LTLIBRARIES =
--
--if HAVE_PULSE
--SUBDIRS += cut-n-paste
--plugin_LTLIBRARIES += libmedia-keys.la
--endif
-+SUBDIRS = cut-n-paste
-+plugin_LTLIBRARIES = libmedia-keys.la
- 
- BUILT_SOURCES = 			\
- 	gsd-media-keys-manager-glue.h	\
-@@ -54,16 +49,14 @@
- 
- libmedia_keys_la_LIBADD  = 		\
- 	$(top_builddir)/plugins/common/libcommon.la			\
--	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
-+	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la        \
- 	$(SETTINGS_PLUGIN_LIBS)						\
- 	$(XF86MISC_LIBS)
- 
- plugin_in_files = 		\
- 	media-keys.gnome-settings-plugin.in
- 
--if HAVE_PULSE
- plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
--endif
- 
- noinst_PROGRAMS =				\
- 	test-media-keys				\
-@@ -124,9 +117,7 @@
- 	$(XF86MISC_LIBS)			\
- 	$(GST_LIBS)
- 
--if HAVE_PULSE
- test_media_keys_LDADD += $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la
--endif
- 
- gtkbuilderdir = $(pkgdatadir)
- gtkbuilder_DATA =	\
-diff -ruN gnome-settings-daemon-2.27.91/plugins/media-keys/cut-n-paste/Makefile.am gnome-settings-daemon-2.27.91.gst/plugins/media-keys/cut-n-paste/Makefile.am
---- gnome-settings-daemon-2.27.91/plugins/media-keys/cut-n-paste/Makefile.am	2009-08-12 11:15:00.000000000 +0200
-+++ gnome-settings-daemon-2.27.91.gst/plugins/media-keys/cut-n-paste/Makefile.am	2009-08-24 15:25:47.000000000 +0200
-@@ -4,16 +4,24 @@
- 
- INCLUDES =					\
- 	$(WARN_CFLAGS)				\
--	$(VOLUME_CONTROL_CFLAGS)		\
--	$(PULSE_CFLAGS)				\
- 	$(NULL)
- 
- libgvc_la_LIBADD =		\
--	$(VOLUME_CONTROL_LIBS)	\
--	$(PULSE_LIBS)		\
- 	$(NULL)
- 
- libgvc_la_SOURCES =			\
-+	$(NULL)
-+
-+if HAVE_PULSE
-+INCLUDES +=					\
-+	$(VOLUME_CONTROL_CFLAGS)		\
-+	$(PULSE_CFLAGS)
-+
-+libgvc_la_LIBADD +=		\
-+	$(VOLUME_CONTROL_LIBS)	\
-+	$(PULSE_LIBS)
-+
-+libgvc_la_SOURCES +=			\
- 	gvc-mixer-stream.h		\
- 	gvc-mixer-stream.c		\
- 	gvc-channel-map.h		\
-@@ -31,8 +39,22 @@
- 	gvc-mixer-event-role.h		\
- 	gvc-mixer-event-role.c		\
- 	gvc-mixer-control.h		\
--	gvc-mixer-control.c		\
--	$(NULL)
-+	gvc-mixer-control.c
-+endif
-+
-+if HAVE_GSTREAMER
-+INCLUDES +=					\
-+	$(SETTINGS_PLUGIN_CFLAGS)		\
-+	$(AM_CFLAGS)				\
-+	$(GST_CFLAGS)
-+
-+libgvc_la_LIBADD +=		\
-+	$(GST_LIBS)
-+
-+libgvc_la_SOURCES +=			\
-+	gvc-gstreamer-acme-vol.c	\
-+	gvc-gstreamer-acme-vol.h
-+endif
- 
- MAINTAINERCLEANFILES =                  \
-         *~                              \
-diff -ruN gnome-settings-daemon-2.27.91/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c gnome-settings-daemon-2.27.91.gst/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c
---- gnome-settings-daemon-2.27.91/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-settings-daemon-2.27.91.gst/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.c	2009-08-24 15:25:47.000000000 +0200
-@@ -0,0 +1,402 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-+
-+/* acme-volume.c
-+
-+   Copyright (C) 2002, 2003 Bastien Nocera
-+   Copyright (C) 2004 Novell, Inc.
-+   Copyright (C) 2009 PERIER Romain <mrpouet@tuxfamily.org>
-+
-+   The Gnome Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   The Gnome Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+
-+   Author: Bastien Nocera <hadess@hadess.net>
-+           Jon Trowbridge <trow@ximian.com>
-+*/
-+
-+#include "config.h"
-+#include "gvc-gstreamer-acme-vol.h"
-+
-+#include <gst/gst.h>
-+#include <gst/audio/mixerutils.h>
-+#include <gst/interfaces/mixer.h>
-+#include <gst/interfaces/propertyprobe.h>
-+
-+#include <gconf/gconf-client.h>
-+
-+#include <string.h>
-+
-+#define TIMEOUT	4
-+
-+#define DEFAULT_MIXER_DEVICE_KEY   "/desktop/gnome/sound/default_mixer_device"
-+#define DEFAULT_MIXER_TRACKS_KEY   "/desktop/gnome/sound/default_mixer_tracks"
-+
-+#define ACME_VOLUME_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ACME_TYPE_VOLUME, AcmeVolumePrivate))
-+
-+struct AcmeVolumePrivate {
-+	GstMixer     *mixer;
-+	GList        *mixer_tracks;
-+	guint         timer_id;
-+	gdouble       volume;
-+	gboolean      mute;
-+	GConfClient  *gconf_client;
-+};
-+
-+G_DEFINE_TYPE (AcmeVolume, acme_volume, G_TYPE_OBJECT)
-+
-+static gboolean acme_volume_open  (AcmeVolume *acme);
-+static void     acme_volume_close (AcmeVolume *acme);
-+static gboolean acme_volume_close_real (AcmeVolume *self);
-+
-+static gpointer acme_volume_object = NULL;
-+
-+static void
-+acme_volume_finalize (GObject *object)
-+{
-+	AcmeVolume *self;
-+
-+	g_return_if_fail (object != NULL);
-+	g_return_if_fail (ACME_IS_VOLUME (object));
-+
-+	self = ACME_VOLUME (object);
-+
-+	if (self->_priv->timer_id != 0)
-+		g_source_remove (self->_priv->timer_id);
-+	acme_volume_close_real (self);
-+
-+	if (self->_priv->gconf_client != NULL) {
-+		g_object_unref (self->_priv->gconf_client);
-+		self->_priv->gconf_client = NULL;
-+	}
-+
-+	G_OBJECT_CLASS (acme_volume_parent_class)->finalize (object);
-+}
-+
-+void
-+acme_volume_set_mute (AcmeVolume *self, gboolean val)
-+{
-+	GList *t;
-+
-+	g_return_if_fail(ACME_IS_VOLUME(self));
-+	g_return_if_fail(acme_volume_open(self));
-+
-+	for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) {
-+		GstMixerTrack *track = GST_MIXER_TRACK (t->data);
-+		gst_mixer_set_mute (self->_priv->mixer, track, val);
-+	}
-+	self->_priv->mute = val;
-+	acme_volume_close (self);
-+}
-+
-+static void
-+update_state (AcmeVolume * self)
-+{
-+	gint *volumes, n;
-+	gdouble vol = 0;
-+	GstMixerTrack *track = GST_MIXER_TRACK (self->_priv->mixer_tracks->data);
-+
-+	/* update mixer by getting volume */
-+	volumes = g_new0 (gint, track->num_channels);
-+	gst_mixer_get_volume (self->_priv->mixer, track, volumes);
-+	for (n = 0; n < track->num_channels; n++)
-+		vol += volumes[n];
-+	g_free (volumes);
-+	vol /= track->num_channels;
-+	vol = 100 * vol / (track->max_volume - track->min_volume);
-+
-+	/* update mute flag, and volume if not muted */
-+	if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MUTE))
-+		self->_priv->mute = TRUE;
-+	self->_priv->volume = vol;
-+}
-+
-+gboolean
-+acme_volume_get_mute (AcmeVolume *self)
-+{
-+	g_return_val_if_fail(acme_volume_open(self), FALSE);
-+
-+	update_state (self);
-+	acme_volume_close (self);
-+
-+	return self->_priv->mute;
-+}
-+
-+gint
-+acme_volume_get_volume (AcmeVolume *self)
-+{
-+
-+	g_return_val_if_fail(acme_volume_open(self), 0);
-+
-+	update_state (self);
-+
-+	acme_volume_close (self);
-+	
-+	return (gint) (self->_priv->volume + 0.5);
-+}
-+
-+void
-+acme_volume_set_volume (AcmeVolume *self, gint val)
-+{
-+	GList *t;
-+
-+	g_return_if_fail(acme_volume_open(self));
-+
-+	val = CLAMP (val, 0, 100);
-+
-+	for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) {
-+		GstMixerTrack *track = GST_MIXER_TRACK (t->data);
-+		gint *volumes, n;
-+		gdouble scale = (track->max_volume - track->min_volume) / 100.0;
-+		gint vol = (gint) (val * scale + track->min_volume + 0.5);
-+
-+		volumes = g_new (gint, track->num_channels);
-+		for (n = 0; n < track->num_channels; n++)
-+			volumes[n] = vol;
-+		gst_mixer_set_volume (self->_priv->mixer, track, volumes);
-+		g_free (volumes);
-+	}
-+
-+	/* update state */
-+	self->_priv->volume = val;
-+
-+	acme_volume_close (self);
-+}
-+
-+void
-+acme_volume_mute_toggle (AcmeVolume *self)
-+{
-+	gboolean muted;
-+
-+	g_return_if_fail (self != NULL);
-+	g_return_if_fail (ACME_IS_VOLUME(self));
-+
-+	muted = acme_volume_get_mute(self);
-+	acme_volume_set_mute(self, !muted);
-+}
-+
-+gint
-+acme_volume_get_threshold (AcmeVolume *self)
-+{
-+	GList *t;
-+	gint steps = 101;
-+
-+	g_return_val_if_fail(acme_volume_open(self), 1);
-+
-+	for (t = self->_priv->mixer_tracks; t != NULL; t = t->next) {
-+		GstMixerTrack *track = GST_MIXER_TRACK (t->data);
-+		gint track_steps = track->max_volume - track->min_volume;
-+		if (track_steps > 0 && track_steps < steps)
-+			steps = track_steps;
-+	}
-+
-+	acme_volume_close (self);
-+
-+	return 100 / steps + 1;
-+}
-+
-+static gboolean
-+acme_volume_close_real (AcmeVolume *self)
-+{
-+	if (self->_priv->mixer != NULL)
-+	{
-+		gst_element_set_state (GST_ELEMENT (self->_priv->mixer), GST_STATE_NULL);
-+		gst_object_unref (GST_OBJECT (self->_priv->mixer));
-+		g_list_foreach (self->_priv->mixer_tracks, (GFunc) g_object_unref, NULL);
-+		g_list_free (self->_priv->mixer_tracks);
-+		self->_priv->mixer = NULL;
-+		self->_priv->mixer_tracks = NULL;
-+	}
-+
-+	self->_priv->timer_id = 0;
-+	return FALSE;
-+}
-+
-+/*
-+ * _acme_set_mixer
-+ * @mixer  A pointer to mixer element
-+ * @data   A pointer to user data (AcmeVolume instance to be modified)
-+ * @return A gboolean indicating success if Master track was found, failed otherwises.
-+ */
-+static gboolean
-+_acme_set_mixer(GstMixer *mixer, gpointer user_data)
-+{
-+	const GList *tracks;
-+
-+	for (tracks = gst_mixer_list_tracks (mixer); tracks != NULL; tracks = tracks->next) {
-+		GstMixerTrack *track = GST_MIXER_TRACK (tracks->data);
-+
-+		if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MASTER)) {
-+			AcmeVolume *self;
-+
-+			self = ACME_VOLUME (user_data);
-+
-+			self->_priv->mixer = mixer;
-+			self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track));
-+			return TRUE;
-+		}
-+
-+		continue;
-+	}
-+
-+	return FALSE;
-+}
-+
-+/* This is a modified version of code from gnome-media's gst-mixer */
-+static gboolean
-+acme_volume_open (AcmeVolume *self)
-+{
-+	gchar *mixer_device, **factory_and_device = NULL;
-+	GList *mixer_list;
-+
-+	if (self->_priv->timer_id != 0) {
-+		g_source_remove (self->_priv->timer_id);
-+		self->_priv->timer_id = 0;
-+		return TRUE;
-+	}
-+
-+	mixer_device = gconf_client_get_string (self->_priv->gconf_client, DEFAULT_MIXER_DEVICE_KEY, NULL);
-+	if (mixer_device != NULL)
-+		factory_and_device = g_strsplit (mixer_device, ":", 2);
-+
-+	if (factory_and_device != NULL && factory_and_device[0] != NULL) {
-+		GstElement *element;
-+
-+		element = gst_element_factory_make (factory_and_device[0], NULL);
-+
-+		if (element != NULL) {
-+			if (factory_and_device[1] != NULL &&
-+			    g_object_class_find_property (G_OBJECT_GET_CLASS (element), "device"))
-+				g_object_set (G_OBJECT (element), "device", factory_and_device[1], NULL);
-+			gst_element_set_state (element, GST_STATE_READY);
-+
-+			if (GST_IS_MIXER (element))
-+				self->_priv->mixer = GST_MIXER (element);
-+			else {
-+				gst_element_set_state (element, GST_STATE_NULL);
-+				gst_object_unref (element);
-+			}
-+		}
-+	}
-+
-+	g_free (mixer_device);
-+	g_strfreev (factory_and_device);
-+
-+	if (self->_priv->mixer != NULL) {
-+		const GList *m;
-+		GSList *tracks, *t;
-+		GError *error = NULL;
-+
-+		/* Try to use tracks saved in GConf 
-+		   Note: errors need to be treated , for example if the user set a non type list for this key
-+		   or if the elements type_list are not "matched" */
-+		tracks = gconf_client_get_list (self->_priv->gconf_client, DEFAULT_MIXER_TRACKS_KEY, 
-+						GCONF_VALUE_STRING, &error);
-+
-+		if (error) {
-+			g_warning("ERROR: %s\n", error->message);
-+			g_error_free(error);
-+		}
-+
-+		/* We use these tracks ONLY if they are supported on the system with the following mixer */
-+		for (m = gst_mixer_list_tracks (self->_priv->mixer); m != NULL; m = m->next) {
-+			GstMixerTrack *track = GST_MIXER_TRACK (m->data);
-+
-+			for (t = tracks; t != NULL; t = t->next)
-+				if (!strcmp (t->data, track->label))
-+					self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track));
-+
-+		}
-+
-+		g_slist_foreach (tracks, (GFunc)g_free, NULL);
-+		g_slist_free (tracks);
-+
-+		/* If no track stored in GConf is avaiable try to use Master track */
-+		if (self->_priv->mixer_tracks == NULL) {
-+			for (m = gst_mixer_list_tracks (self->_priv->mixer); m != NULL; m = m->next) {
-+				GstMixerTrack *track = GST_MIXER_TRACK (m->data);
-+
-+				if (GST_MIXER_TRACK_HAS_FLAG (track, GST_MIXER_TRACK_MASTER)) {
-+					self->_priv->mixer_tracks = g_list_append (self->_priv->mixer_tracks, g_object_ref (track));
-+					break;
-+				}
-+			}
-+		}
-+
-+		if (self->_priv->mixer_tracks != NULL)
-+			return TRUE;
-+		else {
-+			gst_element_set_state (GST_ELEMENT (self->_priv->mixer), GST_STATE_NULL);
-+			gst_object_unref (self->_priv->mixer);
-+		}
-+	}
-+
-+	/* Go through all elements of a certain class and check whether
-+	 * they implement a mixer. If so, walk through the tracks and look
-+	 * for first one named "volume".
-+	 *
-+	 * We should probably do something intelligent if we don't find an
-+	 * appropriate mixer/track.  But now we do something stupid...
-+	 * everything just becomes a no-op.
-+	 */
-+	mixer_list = gst_audio_default_registry_mixer_filter (_acme_set_mixer,
-+			TRUE,
-+			self);
-+
-+	if (mixer_list == NULL)
-+		return FALSE;
-+
-+	/* do not unref the mixer as we keep the ref for self->priv->mixer */
-+	g_list_free (mixer_list);
-+
-+	return TRUE;
-+}
-+
-+static void
-+acme_volume_close (AcmeVolume *self)
-+{
-+	self->_priv->timer_id = g_timeout_add_seconds (TIMEOUT,
-+			(GSourceFunc) acme_volume_close_real, self);
-+}
-+
-+static void
-+acme_volume_init (AcmeVolume *self)
-+{
-+	self->_priv = ACME_VOLUME_GET_PRIVATE (self);
-+	self->_priv->gconf_client = gconf_client_get_default ();
-+}
-+
-+static void
-+acme_volume_class_init (AcmeVolumeClass *klass)
-+{
-+	G_OBJECT_CLASS (klass)->finalize = acme_volume_finalize;
-+
-+	gst_init (NULL, NULL);
-+
-+	g_type_class_add_private (klass, sizeof (AcmeVolumePrivate));
-+}
-+
-+/* acme_volume_new
-+ * @return A singleton instance of type AcmeVolume
-+ */
-+AcmeVolume *
-+acme_volume_new (void)
-+{
-+	if (acme_volume_object == NULL) {
-+		acme_volume_object = g_object_new (ACME_TYPE_VOLUME, NULL);
-+		return ACME_VOLUME(acme_volume_object);
-+	}
-+	g_object_ref(acme_volume_object);
-+	return ACME_VOLUME(acme_volume_object);
-+}
-+
-diff -ruN gnome-settings-daemon-2.27.91/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h gnome-settings-daemon-2.27.91.gst/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h
---- gnome-settings-daemon-2.27.91/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h	1970-01-01 01:00:00.000000000 +0100
-+++ gnome-settings-daemon-2.27.91.gst/plugins/media-keys/cut-n-paste/gvc-gstreamer-acme-vol.h	2009-08-24 15:25:47.000000000 +0200
-@@ -0,0 +1,56 @@
-+/* acme-volume.h
-+
-+   Copyright (C) 2002, 2003 Bastien Nocera
-+   Copyright (C) 2004 Novell, Inc.
-+   Copyright (C) 2009 PERIER Romain <mrpouet@tuxfamily.org>
-+
-+   The Gnome Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Library General Public License as
-+   published by the Free Software Foundation; either version 2 of the
-+   License, or (at your option) any later version.
-+
-+   The Gnome Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Library General Public License for more details.
-+
-+   You should have received a copy of the GNU Library General Public
-+   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+
-+   Author: Bastien Nocera <hadess@hadess.net>
-+           Jon Trowbridge <trow@ximian.com>
-+ */
-+
-+#include <glib-object.h>
-+
-+#define ACME_TYPE_VOLUME                        (acme_volume_get_type ())
-+#define ACME_VOLUME(obj)		        (G_TYPE_CHECK_INSTANCE_CAST ((obj), ACME_TYPE_VOLUME, AcmeVolume))
-+#define ACME_VOLUME_CLASS(klass)	        (G_TYPE_CHECK_CLASS_CAST ((klass),  ACME_TYPE_VOLUME, AcmeVolumeClass))
-+#define ACME_IS_VOLUME(obj)	                (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ACME_TYPE_VOLUME))
-+#define ACME_VOLUME_GET_CLASS(obj)	        (G_TYPE_INSTANCE_GET_CLASS ((obj), ACME_TYPE_VOLUME, AcmeVolumeClass))
-+
-+typedef struct AcmeVolume AcmeVolume;
-+typedef struct AcmeVolumeClass AcmeVolumeClass;
-+typedef struct AcmeVolumePrivate AcmeVolumePrivate;
-+
-+struct AcmeVolume {
-+	GObject parent;
-+	AcmeVolumePrivate *_priv;
-+};
-+
-+struct AcmeVolumeClass {
-+	GObjectClass parent;
-+};
-+
-+GType       acme_volume_get_type      (void);
-+AcmeVolume *acme_volume_new           (void);
-+void        acme_volume_set_mute      (AcmeVolume *self, gboolean val);
-+void        acme_volume_mute_toggle   (AcmeVolume *self);
-+gboolean    acme_volume_get_mute      (AcmeVolume *self);
-+void        acme_volume_set_volume    (AcmeVolume *self, gint val);
-+gint        acme_volume_get_volume    (AcmeVolume *self);
-+gint        acme_volume_get_threshold (AcmeVolume *self);
-+
-+
-diff -ruN gnome-settings-daemon-2.27.91/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-2.27.91.gst/plugins/media-keys/gsd-media-keys-manager.c
---- gnome-settings-daemon-2.27.91/plugins/media-keys/gsd-media-keys-manager.c	2009-08-24 12:20:18.000000000 +0200
-+++ gnome-settings-daemon-2.27.91.gst/plugins/media-keys/gsd-media-keys-manager.c	2009-08-24 16:38:50.000000000 +0200
-@@ -52,6 +52,8 @@
- 
- #ifdef HAVE_PULSE
- #include "gvc-mixer-control.h"
-+#elif defined(HAVE_GSTREAMER)
-+#include "gvc-gstreamer-acme-vol.h"
- #endif /* HAVE_PULSE */
- 
- #define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
-@@ -87,6 +89,8 @@
-         /* Volume bits */
-         GvcMixerControl *volume;
-         GvcMixerStream  *stream;
-+#elif defined(HAVE_GSTREAMER)
-+        AcmeVolume      *volume;
- #endif /* HAVE_PULSE */
-         GtkWidget       *dialog;
-         GConfClient     *conf_client;
-@@ -626,7 +630,9 @@
-                                           GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
-         dialog_show (manager);
- }
-+#endif /* HAVE_PULSE */
- 
-+#if defined(HAVE_PULSE) || defined(HAVE_GSTREAMER)
- static void
- do_sound_action (GsdMediaKeysManager *manager,
-                  int                  type)
-@@ -635,7 +641,11 @@
-         guint vol, norm_vol_step;
-         int vol_step;
- 
-+#ifdef HAVE_PULSE
-         if (manager->priv->stream == NULL)
-+#else
-+        if (manager->priv->volume == NULL)
-+#endif
-                 return;
- 
-         vol_step = gconf_client_get_int (manager->priv->conf_client,
-@@ -645,18 +655,34 @@
-         if (vol_step <= 0 || vol_step > 100)
-                 vol_step = VOLUME_STEP;
- 
-+#ifdef HAVE_PULSE
-         norm_vol_step = PA_VOLUME_NORM * vol_step / 100;
- 
-         /* FIXME: this is racy */
-         vol = gvc_mixer_stream_get_volume (manager->priv->stream);
-         muted = gvc_mixer_stream_get_is_muted (manager->priv->stream);
- 
-+#else
-+        if (vol_step > 0) {
-+                gint threshold = acme_volume_get_threshold (manager->priv->volume);
-+                if (vol_step < threshold)
-+                        vol_step = threshold;
-+                g_debug ("Using volume step of %d", vol_step);
-+        }
-+        vol = acme_volume_get_volume (manager->priv->volume);
-+        muted = acme_volume_get_mute (manager->priv->volume);
-+#endif
-         switch (type) {
-         case MUTE_KEY:
-+#ifdef HAVE_PULSE
-                 muted = !muted;
-                 gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
-+#else
-+                acme_volume_mute_toggle (manager->priv->volume);
-+#endif
-                 break;
-         case VOLUME_DOWN_KEY:
-+#ifdef HAVE_PULSE
-                 if (!muted && (vol <= norm_vol_step)) {
-                         muted = !muted;
-                         vol = 0;
-@@ -668,11 +694,17 @@
-                         if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE)
-                                 gvc_mixer_stream_push_volume (manager->priv->stream);
-                 }
-+#else
-+                if (!muted && (vol <= vol_step))
-+                        acme_volume_mute_toggle (manager->priv->volume);
-+                acme_volume_set_volume (manager->priv->volume, vol - vol_step);
-+#endif
-                 break;
-         case VOLUME_UP_KEY:
-                 if (muted) {
-                         muted = !muted;
-                         if (vol == 0) {
-+#ifdef HAVE_PULSE
-                                vol = vol + norm_vol_step;
-                                gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
-                                if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE)
-@@ -680,7 +712,15 @@
-                         } else {
-                                 gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
-                         }
-+#else
-+                                /* We need to unmute otherwise vol is blocked (and muted) */
-+                                acme_volume_set_mute   (manager->priv->volume, FALSE);
-+                        }
-+                        acme_volume_set_volume (manager->priv->volume, vol + vol_step);
-+                        
-+#endif
-                 } else {
-+#ifdef HAVE_PULSE
-                         if (vol < MAX_VOLUME) {
-                                 gboolean set;
-                                 if (vol + norm_vol_step >= MAX_VOLUME) {
-@@ -691,13 +731,35 @@
-                                 if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE)
-                                         gvc_mixer_stream_push_volume (manager->priv->stream);
-                         }
-+#else
-+                        acme_volume_set_volume (manager->priv->volume, vol + vol_step);
-+#endif
-                 }
-                 break;
-         }
- 
-+#ifdef HAVE_PULSE
-         update_dialog (manager, vol, muted);
-+#else
-+        muted = acme_volume_get_mute (manager->priv->volume);
-+        vol = acme_volume_get_volume (manager->priv->volume);
-+
-+        /* FIXME: AcmeVolume should probably emit signals
-+           instead of doing it like this */
-+        dialog_init (manager);
-+        gsd_media_keys_window_set_volume_muted (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
-+                                                muted);
-+        gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
-+                                                vol);
-+        gsd_media_keys_window_set_action (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
-+                                          GSD_MEDIA_KEYS_WINDOW_ACTION_VOLUME);
-+        dialog_show (manager);
-+#endif /* HAVE_PULSE */
- }
- 
-+#endif /* defined(HAVE_PULSE) || defined(HAVE_GSTREAMER) */
-+
-+#ifdef HAVE_PULSE
- static void
- update_default_sink (GsdMediaKeysManager *manager)
- {
-@@ -856,9 +918,9 @@
-         case MUTE_KEY:
-         case VOLUME_DOWN_KEY:
-         case VOLUME_UP_KEY:
--#ifdef HAVE_PULSE
-+#if defined(HAVE_PULSE) || defined(HAVE_GSTREAMER)
-                 do_sound_action (manager, type);
--#endif /* HAVE_PULSE */
-+#endif /* HAVE_PULSE || HAVE_GSTREAMER */
-                 break;
-         case POWER_KEY:
-                 do_exit_action (manager);
-@@ -1061,6 +1123,10 @@
-         gvc_mixer_control_open (manager->priv->volume);
- 
-         gnome_settings_profile_end ("gvc_mixer_control_new");
-+#elif defined(HAVE_GSTREAMER)
-+        gnome_settings_profile_start ("acme_volume_new");
-+        manager->priv->volume = acme_volume_new ();
-+        gnome_settings_profile_end ("acme_volume_new");
- #endif /* HAVE_PULSE */
-         g_idle_add ((GSourceFunc) start_media_keys_idle_cb, manager);
- 
-@@ -1133,6 +1199,7 @@
-                 g_object_unref (priv->stream);
-                 priv->stream = NULL;
-         }
-+#elif defined(HAVE_GSTREAMER)
- 
-         if (priv->volume) {
-                 g_object_unref (priv->volume);
diff --git a/extra/gnome-user-share/gnome-user-share-2.30.1-libnotify-0.7.patch b/extra/gnome-user-share/gnome-user-share-2.30.1-libnotify-0.7.patch
deleted file mode 100644
index 73c5a9ab8..000000000
--- a/extra/gnome-user-share/gnome-user-share-2.30.1-libnotify-0.7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-http://pkgs.fedoraproject.org/gitweb/?p=gnome-user-share.git;a=blob;f=notify.patch;hb=HEAD
-
---- src/obexpush.c
-+++ src/obexpush.c
-@@ -139,10 +139,9 @@ show_notification (const char *filename)
- 	/* Translators: %s is the name of the filename received */
- 	notification_text = g_strdup_printf(_("You received \"%s\" via Bluetooth"), display);
- 	g_free (display);
--	notification = notify_notification_new_with_status_icon (_("You received a file"),
--								 notification_text,
--								 "dialog-information",
--								 GTK_STATUS_ICON (statusicon));
-+	notification = notify_notification_new (_("You received a file"),
-+					         notification_text,
-+					         "dialog-information");
- 
- 	notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT);
- 
-@@ -218,10 +217,10 @@ device_is_authorised (const char *bdaddr
- 		char *device_path;
- 		GHashTable *props;
- 
--		g_message ("checking adapter %s", g_ptr_array_index (adapters, i));
-+		g_message ("checking adapter %s", (char *)g_ptr_array_index (adapters, i));
- 
- 		adapter = dbus_g_proxy_new_for_name (connection, "org.bluez",
--						    g_ptr_array_index (adapters, i), "org.bluez.Adapter");
-+						    (char *)g_ptr_array_index (adapters, i), "org.bluez.Adapter");
- 
- 		if (dbus_g_proxy_call (adapter, "FindDevice", NULL,
- 				       G_TYPE_STRING, bdaddr, G_TYPE_INVALID,
diff --git a/extra/gnome-vfs/hal-show-volume-names.patch b/extra/gnome-vfs/hal-show-volume-names.patch
deleted file mode 100644
index 5b8420c2b..000000000
--- a/extra/gnome-vfs/hal-show-volume-names.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: gnome-vfs-hal-mounts.c
-===================================================================
-RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c,v
-retrieving revision 1.33
-diff -u -p -r1.33 gnome-vfs-hal-mounts.c
---- gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c	7 Jul 2006 15:56:57 -0000	1.33
-+++ gnome-vfs/libgnomevfs/gnome-vfs-hal-mounts.c	14 Jul 2006 18:48:51 -0000
-@@ -877,6 +877,7 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
- 	GnomeVFSDrive *drive;
- 	GnomeVFSVolumeMonitor *volume_monitor;
- 	char *name;
-+  char *icon;
- 	gboolean allowed_by_policy;
- 	const char *backing_udi;
- 
-@@ -975,6 +976,8 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
- 	 */
- 	drive = _gnome_vfs_volume_monitor_find_drive_by_hal_udi (volume_monitor, libhal_volume_get_udi (hal_volume));
- 	if (drive == NULL && allowed_by_policy) {
-+    name = _hal_drive_policy_get_display_name (volume_monitor_daemon, hal_drive, hal_volume);
-+    icon = _hal_drive_policy_get_icon (volume_monitor_daemon, hal_drive, hal_volume);
- 		drive = g_object_new (GNOME_VFS_TYPE_DRIVE, NULL);
- 		if (libhal_volume_disc_has_audio (hal_volume)) {
- 			drive->priv->activation_uri = g_strdup_printf ("cdda://%s", 
-@@ -989,16 +992,16 @@ _hal_add_volume (GnomeVFSVolumeMonitorDa
- 			 * So just set it to the empty string
- 			 */
- 			drive->priv->activation_uri = g_strdup ("");
-+      g_free (name);
-+      name = _hal_volume_policy_get_display_name (volume_monitor_daemon, hal_drive, hal_volume);
-+      g_free (icon);
-+      icon = _hal_volume_policy_get_icon (volume_monitor_daemon, hal_drive, hal_volume);
- 		}
- 		drive->priv->is_connected = TRUE;
- 		drive->priv->device_path = g_strdup (libhal_volume_get_device_file (hal_volume));
- 		drive->priv->device_type = _hal_get_gnome_vfs_device_type (hal_drive);
- 	
--		/* TODO: could add an icon of a drive with media in it since this codepath only
--		 * handles drives with media in them
--		 */
--		drive->priv->icon = _hal_drive_policy_get_icon (volume_monitor_daemon, hal_drive, NULL);
--		name = _hal_drive_policy_get_display_name (volume_monitor_daemon, hal_drive, hal_volume);
-+    drive->priv->icon = icon;
- 		drive->priv->display_name = _gnome_vfs_volume_monitor_uniquify_drive_name (volume_monitor, name);
- 		g_free (name);
- 		name = g_utf8_casefold (drive->priv->display_name, -1);
diff --git a/extra/gtk2/old-icon-symlinks.patch b/extra/gtk2/old-icon-symlinks.patch
deleted file mode 100644
index 046dd4df4..000000000
--- a/extra/gtk2/old-icon-symlinks.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-diff -aur gtk+-2.22.0.orig//gtk/Makefile.in gtk+-2.22.0/gtk/Makefile.in
---- gtk+-2.22.0.orig//gtk/Makefile.in	2010-10-15 04:57:50.810006145 +0800
-+++ gtk+-2.22.0/gtk/Makefile.in	2010-10-15 05:13:49.083339478 +0800
-@@ -1598,7 +1598,172 @@
- 	stock-icons/24/folder-remote.png 		\
- 	stock-icons/24/user-home.png 			\
- 	stock-icons/24/user-desktop.png 		\
--	stock-icons/24/text-x-generic.png
-+	stock-icons/24/text-x-generic.png		\
-+	stock-icons/16/gtk-quit.png			\
-+	stock-icons/16/gtk-info.png			\
-+	stock-icons/16/gtk-file.png			\
-+	stock-icons/16/gtk-open.png			\
-+	stock-icons/16/gtk-print-preview.png		\
-+	stock-icons/16/gtk-print.png			\
-+	stock-icons/16/gtk-properties.png		\
-+	stock-icons/16/gtk-revert-to-saved-ltr.png	\
-+	stock-icons/16/gtk-revert-to-saved-rtl.png	\
-+	stock-icons/16/gtk-save-as.png			\
-+	stock-icons/16/gtk-new.png			\
-+	stock-icons/16/gtk-harddisk.png			\
-+	stock-icons/16/gtk-clear.png			\
-+	stock-icons/16/gtk-copy.png			\
-+	stock-icons/16/gtk-cut.png			\
-+	stock-icons/16/gtk-delete.png			\
-+	stock-icons/16/gtk-find-and-replace.png		\
-+	stock-icons/16/gtk-find.png			\
-+	stock-icons/16/gtk-paste.png			\
-+	stock-icons/16/gtk-redo-ltr.png			\
-+	stock-icons/16/gtk-redo-rtl.png			\
-+	stock-icons/16/gtk-select-all.png		\
-+	stock-icons/16/gtk-undo-ltr.png			\
-+	stock-icons/16/gtk-undo-rtl.png			\
-+	stock-icons/16/gtk-directory.png		\
-+	stock-icons/16/gtk-unindent-ltr.png		\
-+	stock-icons/16/gtk-unindent-rtl.png		\
-+	stock-icons/16/gtk-indent-ltr.png		\
-+	stock-icons/16/gtk-indent-rtl.png		\
-+	stock-icons/16/gtk-justify-center.png		\
-+	stock-icons/16/gtk-justify-fill.png		\
-+	stock-icons/16/gtk-justify-left.png		\
-+	stock-icons/16/gtk-justify-right.png		\
-+	stock-icons/16/gtk-bold.png			\
-+	stock-icons/16/gtk-italic.png			\
-+	stock-icons/16/gtk-strikethrough.png		\
-+	stock-icons/16/gtk-underline.png		\
-+	stock-icons/16/gtk-goto-bottom.png		\
-+	stock-icons/16/gtk-go-down.png			\
-+	stock-icons/16/gtk-goto-first-ltr.png		\
-+	stock-icons/16/gtk-home.png			\
-+	stock-icons/16/gtk-jump-to-ltr.png		\
-+	stock-icons/16/gtk-jump-to-rtl.png		\
-+	stock-icons/16/gtk-goto-last-ltr.png		\
-+	stock-icons/16/gtk-go-forward-ltr.png		\
-+	stock-icons/16/gtk-go-back-ltr.png		\
-+	stock-icons/16/gtk-goto-top.png			\
-+	stock-icons/16/gtk-go-up.png			\
-+	stock-icons/16/gtk-about.png			\
-+	stock-icons/16/gtk-help.png			\
-+	stock-icons/16/gtk-missing-image.png		\
-+	stock-icons/16/gtk-add.png			\
-+	stock-icons/16/gtk-remove.png			\
-+	stock-icons/16/gtk-floppy.png			\
-+	stock-icons/16/gtk-cdrom.png			\
-+	stock-icons/16/gtk-media-pause.png		\
-+	stock-icons/16/gtk-media-play-ltr.png		\
-+	stock-icons/16/gtk-media-play-rtl.png		\
-+	stock-icons/16/gtk-media-stop.png		\
-+	stock-icons/16/gtk-media-record.png		\
-+	stock-icons/16/gtk-media-rewind-ltr.png		\
-+	stock-icons/16/gtk-media-forward-ltr.png	\
-+	stock-icons/16/gtk-media-previous-ltr.png	\
-+	stock-icons/16/gtk-media-next-ltr.png		\
-+	stock-icons/16/gtk-network.png			\
-+	stock-icons/16/gtk-print-error.png		\
-+	stock-icons/16/gtk-print-report.png		\
-+	stock-icons/16/gtk-print-paused.png		\
-+	stock-icons/16/gtk-print-warning.png		\
-+	stock-icons/16/gtk-stop.png			\
-+	stock-icons/16/gtk-execute.png			\
-+	stock-icons/16/gtk-spell-check.png		\
-+	stock-icons/16/gtk-fullscreen.png		\
-+	stock-icons/16/gtk-refresh.png			\
-+	stock-icons/16/gtk-leave-fullscreen.png		\
-+	stock-icons/16/gtk-sort-ascending.png		\
-+	stock-icons/16/gtk-sort-descending.png		\
-+	stock-icons/16/gtk-close.png			\
-+	stock-icons/16/gtk-zoom-fit.png			\
-+	stock-icons/16/gtk-zoom-in.png			\
-+	stock-icons/16/gtk-zoom-100.png			\
-+	stock-icons/16/gtk-zoom-out.png			\
-+	stock-icons/24/gtk-quit.png			\
-+	stock-icons/24/gtk-info.png			\
-+	stock-icons/24/gtk-file.png			\
-+	stock-icons/24/gtk-open.png			\
-+	stock-icons/24/gtk-print-preview.png		\
-+	stock-icons/24/gtk-print.png			\
-+	stock-icons/24/gtk-properties.png		\
-+	stock-icons/24/gtk-revert-to-saved-ltr.png	\
-+	stock-icons/24/gtk-revert-to-saved-rtl.png	\
-+	stock-icons/24/gtk-save-as.png			\
-+	stock-icons/24/gtk-new.png			\
-+	stock-icons/24/gtk-harddisk.png			\
-+	stock-icons/24/gtk-clear.png			\
-+	stock-icons/24/gtk-copy.png			\
-+	stock-icons/24/gtk-cut.png			\
-+	stock-icons/24/gtk-delete.png			\
-+	stock-icons/24/gtk-find-and-replace.png		\
-+	stock-icons/24/gtk-find.png			\
-+	stock-icons/24/gtk-paste.png			\
-+	stock-icons/24/gtk-redo-ltr.png			\
-+	stock-icons/24/gtk-redo-rtl.png			\
-+	stock-icons/24/gtk-select-all.png		\
-+	stock-icons/24/gtk-undo-ltr.png			\
-+	stock-icons/24/gtk-undo-rtl.png			\
-+	stock-icons/24/gtk-directory.png		\
-+	stock-icons/24/gtk-unindent-ltr.png		\
-+	stock-icons/24/gtk-unindent-rtl.png		\
-+	stock-icons/24/gtk-indent-ltr.png		\
-+	stock-icons/24/gtk-indent-rtl.png		\
-+	stock-icons/24/gtk-justify-center.png		\
-+	stock-icons/24/gtk-justify-fill.png		\
-+	stock-icons/24/gtk-justify-left.png		\
-+	stock-icons/24/gtk-justify-right.png		\
-+	stock-icons/24/gtk-bold.png			\
-+	stock-icons/24/gtk-italic.png			\
-+	stock-icons/24/gtk-strikethrough.png		\
-+	stock-icons/24/gtk-underline.png		\
-+	stock-icons/24/gtk-goto-bottom.png		\
-+	stock-icons/24/gtk-go-down.png			\
-+	stock-icons/24/gtk-goto-first-ltr.png		\
-+	stock-icons/24/gtk-home.png			\
-+	stock-icons/24/gtk-jump-to-ltr.png		\
-+	stock-icons/24/gtk-jump-to-rtl.png		\
-+	stock-icons/24/gtk-goto-last-ltr.png		\
-+	stock-icons/24/gtk-go-forward-ltr.png		\
-+	stock-icons/24/gtk-go-back-ltr.png		\
-+	stock-icons/24/gtk-goto-top.png			\
-+	stock-icons/24/gtk-go-up.png			\
-+	stock-icons/24/gtk-about.png			\
-+	stock-icons/24/gtk-help.png			\
-+	stock-icons/24/gtk-missing-image.png		\
-+	stock-icons/24/gtk-add.png			\
-+	stock-icons/24/gtk-remove.png			\
-+	stock-icons/24/gtk-floppy.png			\
-+	stock-icons/24/gtk-cdrom.png			\
-+	stock-icons/24/gtk-media-pause.png		\
-+	stock-icons/24/gtk-media-play-ltr.png		\
-+	stock-icons/24/gtk-media-play-rtl.png		\
-+	stock-icons/24/gtk-media-stop.png		\
-+	stock-icons/24/gtk-media-record.png		\
-+	stock-icons/24/gtk-media-rewind-ltr.png		\
-+	stock-icons/24/gtk-media-forward-ltr.png	\
-+	stock-icons/24/gtk-media-previous-ltr.png	\
-+	stock-icons/24/gtk-media-next-ltr.png		\
-+	stock-icons/24/gtk-network.png			\
-+	stock-icons/24/gtk-print-error.png		\
-+	stock-icons/24/gtk-print-report.png		\
-+	stock-icons/24/gtk-print-paused.png		\
-+	stock-icons/24/gtk-print-warning.png		\
-+	stock-icons/24/gtk-stop.png			\
-+	stock-icons/24/gtk-execute.png			\
-+	stock-icons/24/gtk-spell-check.png		\
-+	stock-icons/24/gtk-fullscreen.png		\
-+	stock-icons/24/gtk-refresh.png			\
-+	stock-icons/24/gtk-leave-fullscreen.png		\
-+	stock-icons/24/gtk-sort-ascending.png		\
-+	stock-icons/24/gtk-sort-descending.png		\
-+	stock-icons/24/gtk-close.png			\
-+	stock-icons/24/gtk-zoom-fit.png			\
-+	stock-icons/24/gtk-zoom-in.png			\
-+	stock-icons/24/gtk-zoom-100.png			\
-+	stock-icons/24/gtk-zoom-out.png			\
-+	stock-icons/48/gtk-dialog-error.png
- 
- @CROSS_COMPILING_FALSE@gtk_update_icon_cache_program = \
- @CROSS_COMPILING_FALSE@	   ./gtk-update-icon-cache
-@@ -2869,7 +3034,91 @@
- 	   && $(LN_S) folder.png user-desktop.png 			\
- 	   && $(RM) text-x-generic.png 					\
- 	   && $(LN_S) document-x-generic.png text-x-generic.png 	\
-+	   && $(LN_S) application-exit.png gtk-quit.png			\
-+	   && $(LN_S) dialog-information.png gtk-info.png			\
-+	   && $(LN_S) document-new.png gtk-file.png			\
-+	   && $(LN_S) document-open.png gtk-open.png			\
-+	   && $(LN_S) document-print-preview.png gtk-print-preview.png			\
-+	   && $(LN_S) document-print.png gtk-print.png			\
-+	   && $(LN_S) document-properties.png gtk-properties.png			\
-+	   && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png			\
-+	   && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png			\
-+	   && $(LN_S) document-save-as.png gtk-save-as.png			\
-+	   && $(LN_S) document-x-generic.png gtk-new.png			\
-+	   && $(LN_S) drive-harddisk.png gtk-harddisk.png			\
-+	   && $(LN_S) edit-clear.png gtk-clear.png			\
-+	   && $(LN_S) edit-copy.png gtk-copy.png			\
-+	   && $(LN_S) edit-cut.png gtk-cut.png			\
-+	   && $(LN_S) edit-delete.png gtk-delete.png			\
-+	   && $(LN_S) edit-find-replace.png gtk-find-and-replace.png			\
-+	   && $(LN_S) edit-find.png gtk-find.png			\
-+	   && $(LN_S) edit-paste.png gtk-paste.png			\
-+	   && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png			\
-+	   && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png			\
-+	   && $(LN_S) edit-select-all.png gtk-select-all.png			\
-+	   && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png			\
-+	   && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png			\
-+	   && $(LN_S) folder.png gtk-directory.png			\
-+	   && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png			\
-+	   && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png			\
-+	   && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png			\
-+	   && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png			\
-+	   && $(LN_S) format-justify-center.png gtk-justify-center.png			\
-+	   && $(LN_S) format-justify-fill.png gtk-justify-fill.png			\
-+	   && $(LN_S) format-justify-left.png gtk-justify-left.png			\
-+	   && $(LN_S) format-justify-right.png gtk-justify-right.png			\
-+	   && $(LN_S) format-text-bold.png gtk-bold.png			\
-+	   && $(LN_S) format-text-italic.png gtk-italic.png			\
-+	   && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png			\
-+	   && $(LN_S) format-text-underline.png gtk-underline.png			\
-+	   && $(LN_S) go-bottom.png gtk-goto-bottom.png			\
-+	   && $(LN_S) go-down.png gtk-go-down.png			\
-+	   && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png			\
-+	   && $(LN_S) go-home.png gtk-home.png			\
-+	   && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png			\
-+	   && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png			\
-+	   && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png			\
-+	   && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png			\
-+	   && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png			\
-+	   && $(LN_S) go-top.png gtk-goto-top.png			\
-+	   && $(LN_S) go-up.png gtk-go-up.png			\
-+	   && $(LN_S) help-about.png gtk-about.png			\
-+	   && $(LN_S) help-contents.png gtk-help.png			\
-+	   && $(LN_S) image-missing.png gtk-missing-image.png			\
-+	   && $(LN_S) list-add.png gtk-add.png			\
-+	   && $(LN_S) list-remove.png gtk-remove.png			\
-+	   && $(LN_S) media-floppy.png gtk-floppy.png			\
-+	   && $(LN_S) media-optical.png gtk-cdrom.png			\
-+	   && $(LN_S) media-playback-pause.png gtk-media-pause.png			\
-+	   && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png			\
-+	   && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png			\
-+	   && $(LN_S) media-playback-stop.png gtk-media-stop.png			\
-+	   && $(LN_S) media-record.png gtk-media-record.png			\
-+	   && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png			\
-+	   && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png			\
-+	   && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png			\
-+	   && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png			\
-+	   && $(LN_S) network-idle.png gtk-network.png			\
-+	   && $(LN_S) printer-error.png gtk-print-error.png			\
-+	   && $(LN_S) printer-info.png gtk-print-report.png			\
-+	   && $(LN_S) printer-paused.png gtk-print-paused.png			\
-+	   && $(LN_S) printer-warning.png gtk-print-warning.png			\
-+	   && $(LN_S) process-stop.png gtk-stop.png			\
-+	   && $(LN_S) system-run.png gtk-execute.png			\
-+	   && $(LN_S) tools-check-spelling.png gtk-spell-check.png			\
-+	   && $(LN_S) view-fullscreen.png gtk-fullscreen.png			\
-+	   && $(LN_S) view-refresh.png gtk-refresh.png			\
-+	   && $(LN_S) view-restore.png gtk-leave-fullscreen.png			\
-+	   && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png			\
-+	   && $(LN_S) view-sort-descending.png gtk-sort-descending.png			\
-+	   && $(LN_S) window-close.png gtk-close.png			\
-+	   && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png			\
-+	   && $(LN_S) zoom-in.png gtk-zoom-in.png			\
-+	   && $(LN_S) zoom-original.png gtk-zoom-100.png			\
-+	   && $(LN_S) zoom-out.png gtk-zoom-out.png			\
- 	) done 								\
-+	&& (cd stock-icons/48						\
-+	   && $(LN_S) dialog-error.png gtk-dialog-error.png)		\
- 	&& touch stamp-icons
- 
- gtkbuiltincache.h: @REBUILD@ stamp-icons
diff --git a/extra/libnotify/libnotify-0.7.1-gtk3-tests.patch b/extra/libnotify/libnotify-0.7.1-gtk3-tests.patch
deleted file mode 100644
index 7d1230520..000000000
--- a/extra/libnotify/libnotify-0.7.1-gtk3-tests.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 92983cacd36fa9b050f911bc4de09b8c4fb9f3b2 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Thu, 16 Dec 2010 00:01:13 +0100
-Subject: [PATCH] gentoo: do not build gtk+:3 tests if not required
-
----
- configure.ac      |    5 +++++
- tests/Makefile.am |   30 +++++++++++++++++-------------
- 2 files changed, 22 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 71609ed..7767c5b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,10 +97,15 @@ AC_SUBST(PACKAGE_LIBS)
- AC_SUBST(PACKAGE_CFLAGS)
- AC_SUBST(pkg_modules)
- 
-+AC_ARG_ENABLE([tests],
-+	AS_HELP_STRING([--enable-tests], [Check for extra dependencies to build all tests]))
-+AS_IF([test $enable_tests = yes], [
- tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION"
- PKG_CHECK_MODULES(TESTS, [$tests_modules])
-+])
- AC_SUBST(TESTS_LIBS)
- AC_SUBST(TESTS_CFLAGS)
-+AM_CONDITIONAL([MORE_TESTS], [test $enable_tests = yes])
- 
- GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
- AC_SUBST(GLIB_GENMARSHAL)
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 7acf9a3..2856a82 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -2,18 +2,15 @@ INCLUDES = \
- 	-I$(top_srcdir) \
- 	$(TESTS_CFLAGS)
- 
--noinst_PROGRAMS = \
-+check_PROGRAMS = \
- 	test-replace \
--	test-replace-widget \
- 	test-server-info \
- 	test-default-action \
- 	test-multi-actions \
- 	test-action-icons \
--	test-image \
- 	test-basic \
- 	test-error \
- 	test-markup \
--	test-persistence \
- 	test-resident \
- 	test-rtl \
- 	test-size-changes \
-@@ -23,6 +20,22 @@ noinst_PROGRAMS = \
- 	test-xy-actions \
- 	test-xy-stress
- 
-+#if MORE_TESTS
-+check_PROGRAMS += \
-+	test-image \
-+	test-replace-widget \
-+	test-persistence
-+
-+test_replace_widget_SOURCES = test-replace-widget.c
-+test_replace_widget_LDADD  = $(common_ldflags)
-+
-+test_image_SOURCES = test-image.c
-+test_image_LDADD  = $(common_ldflags)
-+
-+test_persistence_SOURCES = test-persistence.c
-+test_persistence_LDADD = $(common_ldflags)
-+#endif
-+
- common_ldflags = \
- 	$(top_builddir)/libnotify/libnotify.la \
- 	$(TESTS_LIBS)
-@@ -30,9 +43,6 @@ common_ldflags = \
- test_replace_SOURCES = test-replace.c
- test_replace_LDADD  = $(common_ldflags)
- 
--test_replace_widget_SOURCES = test-replace-widget.c
--test_replace_widget_LDADD  = $(common_ldflags)
--
- test_server_info_SOURCES = test-server-info.c
- test_server_info_LDADD   = $(common_ldflags)
- 
-@@ -48,9 +58,6 @@ test_multi_actions_LDADD  = $(common_ldflags)
- test_action_icons_SOURCES = test-action-icons.c
- test_action_icons_LDADD  = $(common_ldflags)
- 
--test_image_SOURCES = test-image.c
--test_image_LDADD  = $(common_ldflags)
--
- test_basic_SOURCES = test-basic.c
- test_basic_LDADD = $(common_ldflags)
- 
-@@ -75,9 +82,6 @@ test_xy_stress_LDADD = $(common_ldflags)
- test_rtl_SOURCES = test-rtl.c
- test_rtl_LDADD = $(common_ldflags)
- 
--test_persistence_SOURCES = test-persistence.c
--test_persistence_LDADD = $(common_ldflags)
--
- test_resident_SOURCES = test-resident.c
- test_resident_LDADD = $(common_ldflags)
- 
--- 
-1.7.4.rc2
-
diff --git a/extra/libwebkit/introspection.patch b/extra/libwebkit/introspection.patch
deleted file mode 100644
index f12e9e629..000000000
--- a/extra/libwebkit/introspection.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- WebKit/gtk/JSCore-1.0.gir	2010-09-29 14:54:07.000000000 +0200
-+++ WebKit/gtk/JSCore-1.0.gir	2010-09-29 15:57:06.000000000 +0200
-@@ -1,12 +1,14 @@
- <?xml version="1.0"?>
--<repository version="1.0"
-+<repository version="1.2"
-             xmlns="http://www.gtk.org/introspection/core/1.0"
-             xmlns:c="http://www.gtk.org/introspection/c/1.0">
-   <namespace name="JSCore" version="1.0" shared-library="webkit-1.0">
--    <alias name="GlobalContextRef"
--           target="none"
--           c:type="JSGlobalContextRef"/>
--    <alias name="ObjectRef" target="none" c:type="JSObjectRef"/>
-+    <alias name="GlobalContextRef" target="none">
-+      <type name="JSGlobalContextRef" c:type="JSGlobalContextRef"/>
-+    </alias>
-+    <alias name="ObjectRef" target="none">
-+      <type name="JSObjectRef" c:type="JSObjectRef"/>
-+    </alias>
-     <function name="EvaluateScript" c:identifier="JSEvaluateScript">
-       <return-value transfer-ownership="none">
-         <type name="none" c:type="void"/>
diff --git a/extra/liferea/ChangeLog b/extra/liferea/ChangeLog
deleted file mode 100644
index c0861a7ae..000000000
--- a/extra/liferea/ChangeLog
+++ /dev/null
@@ -1,143 +0,0 @@
-2011-03-07  Jan Steffens  <jan.steffens@gmail.com>
-
-	* liferea 1.6.5-2
-	* Add patch for libnotify-0.7
-	* Add hicolor-icon-theme dependency
-
-2010-09-29  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.6.5-1
-	* Upstream update
-
-2010-06-30  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.6.4-1
-	* Upstream update
-	* Changed libnotify depends to optdepends
-	* Tidied up package description
-
-2010-02-22  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.6.3-1
-	* Upstream update
-
-2010-01-23  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.6.2-1
-	* Upstream update
-
-2009-11-20  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.6.1-1
-	* Upstream update
-
-2009-07-26  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.6.0-1
-	* Upstream update
-	* Updated depends
-	* Added lua support
-
-2009-07-01 Jan de Groot  <jgc@archlinux.org>
-
-	* liferea 1.4.28-2
-	* Rebuild for xulrunner 1.9.1
-	* Remove networkmanager dependencies
-
-2009-04-13  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.28-1
-	* Upstream update
-
-2009-03-15  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.27-1
-	* Upstream update
-
-2009-02-21  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.25-1
-	* Upstream update
-
-2009-02-01  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.24-1
-	* Upstream update
-
-2008-12-29  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.23-1
-	* Upstream update
-
-2008-11-14  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.22d-1
-	* Upstream update
-
-2008-10-27  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.20-1
-	* Forced downgrade (close FS#11899)
-
-2008-10-26  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.21b-1
-	* Upstream update
-
-2008-10-01  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.20-1
-	* Upstream update
-
-2008-09-06  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.19-1
-	* Upstream update
-
-2008-08-03  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.18-2
-	* Rebuilt against gnutls 2.4.1
-
-2008-07-28  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.18-1
-	* Upstream update
-	* Updated xulrunner 1.9 support patch
-	* Added intltool makedepends
-	* Removed force option
-	
-2008-06-22  Jan de Groot  <jgc@archlinux.org>
-	
-	* liferea 1.4.16b-2
-	* Build with xulrunner 1.9
-	* Add patch from gentoo to fix xulrunner 1.9 support
-	* Make versioned dependencies more strict
-	* Drop dependencies covered by xulrunner 1.9
-
-2008-06-17  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.16b-1
-	* Upstream update
-	* Added force option
-
-2008-06-13  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.16-1
-	* Upstream update
-
-2008-04-17  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.15-1
-	* Upstream update
-
-2008-03-12  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.14-1
-	* Upstream update
-
-2008-03-06  Eric Belanger  <eric@archlinux.org>
-
-	* liferea 1.4.13-1
-	* Upstream update
-	* Cleaned install scriptlet
diff --git a/extra/mail-notification/evolution-gtkhtml.patch b/extra/mail-notification/evolution-gtkhtml.patch
deleted file mode 100644
index fe9b0ddf8..000000000
--- a/extra/mail-notification/evolution-gtkhtml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c.orig	2009-10-12 23:15:03.000000000 +0200
-+++ mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c	2009-10-12 23:17:26.000000000 +0200
-@@ -41,7 +41,7 @@
-   if (! minversion)
-     minversion = "2.12";
- 
--  packages = g_strdup_printf("evolution-plugin >= %s", minversion);
-+  packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.14 gtkhtml-editor-3.14", minversion);
-   result = jb_check_packages("Evolution", "evolution-plugin", packages);
-   g_free(packages);
- 
diff --git a/extra/mail-notification/evolution.patch b/extra/mail-notification/evolution.patch
deleted file mode 100644
index 073818afe..000000000
--- a/extra/mail-notification/evolution.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- build/src/mn-evolution-server.c.orig	2008-09-30 15:30:07.756216978 +0200
-+++ build/src/mn-evolution-server.c	2008-09-30 15:30:49.950220711 +0200
-@@ -27,6 +27,7 @@
- #include <stdio.h>
- #include <libintl.h>
- #include <gobject/gvaluecollector.h>
-+#include <libedataserver/eds-version.h>
- #include <camel/camel-folder.h>
- #include <mail/em-folder-view.h>
- #include <mail/em-format.h>
-@@ -595,7 +596,12 @@
- 
- 	for (i = 0; i < summary->len; i++)
- 	  {
-+#if EDS_CHECK_VERSION(2,23,5)
-+	    char *uid = summary->pdata[i];
-+	    CamelMessageInfo *info = camel_folder_get_message_info(folder, uid);
-+#else
- 	    CamelMessageInfo *info = summary->pdata[i];
-+#endif
- 
- 	    if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0)
- 	      g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info));
---- build/src/mn-evolution-folder-tree-server.c.evolution	2010-02-01 10:00:12.128683776 -0500
-+++ build/src/mn-evolution-folder-tree-server.c	2010-02-01 10:02:32.809697243 -0500
-@@ -26,5 +26,8 @@
- #include <dbus/dbus.h>
-+#include <libedataserver/eds-version.h>
-+#if !EDS_CHECK_VERSION(2,29,0)
- #include <mail/mail-component.h>
-+#endif
- #include <mail/em-folder-tree.h>
- #include "mn-evolution-plugin.h"
- #include "mn-evolution.h"
-@@ -396,7 +399,11 @@ mn_evolution_folder_tree_server_construc
- 	
-+#if EDS_CHECK_VERSION(2,29,0)
-+    selfp->tree = em_folder_tree_new();
-+#else
-     EMFolderTreeModel *model;
-
-     model = mail_component_peek_tree_model(mail_component_peek());
-     selfp->tree = em_folder_tree_new_with_model(model);
-+#endif
- 
-     selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id);
---- build/src/mn-evolution-server.c.evolution	2010-02-01 10:06:36.484698060 -0500
-+++ build/src/mn-evolution-server.c	2010-02-01 10:09:01.946682081 -0500
-@@ -28,9 +28,14 @@
- #include <gobject/gvaluecollector.h>
- #include <libedataserver/eds-version.h>
- #include <camel/camel-folder.h>
-+#if EDS_CHECK_VERSION(2,29,0)
-+#include <shell/e-shell.h>
-+#include <mail/e-mail-browser.h>
-+#else
- #include <mail/em-folder-view.h>
- #include <mail/em-format.h>
- #include <mail/em-message-browser.h>
-+#endif
- #include <mail/em-utils.h>
- #include <mail/mail-session.h>
- #include <mail/mail-tools.h>
-@@ -568,6 +573,19 @@ mn_evolution_server_open_message (MNEvol
-     folder = self_lookup_folder(folder_uri, err);
-     if (folder)
-       {
-+#if EDS_CHECK_VERSION(2,29,0)
-+	EShell *shell;
-+	EShellBackend *shell_backend;
-+	GtkWidget *browser;
-+
-+	shell = e_shell_get_default ();
-+	shell_backend = e_shell_get_backend_by_name (shell, "mail");
-+
-+	browser = e_mail_browser_new (shell_backend);
-+	e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri);
-+	e_mail_reader_set_message (E_MAIL_READER (browser), message_uid);
-+	gtk_widget_show (browser);
-+#else
- 	GtkWidget *browser;
- 
- 	/* modelled after Evolution's handleuri_got_folder() */
-@@ -578,6 +596,7 @@ mn_evolution_server_open_message (MNEvol
- 	em_folder_view_set_folder((EMFolderView *) browser, folder, folder_uri);
- 	em_folder_view_set_message((EMFolderView *) browser, message_uid, FALSE);
- 	gtk_widget_show(((EMMessageBrowser *) browser)->window);
-+#endif
- 
- 	camel_object_unref(folder);
-       }
---- src/mn-evolution-plugin.c.evolution	2008-05-22 11:45:35.000000000 -0400
-+++ src/mn-evolution-plugin.c	2010-02-01 11:52:06.141664757 -0500
-@@ -204,7 +204,7 @@ connect_to_session_bus (void)
- }
- 
- int
--e_plugin_lib_enable (EPluginLib *ep, int enable)
-+e_plugin_lib_enable (EPlugin *ep, int enable)
- {
-   static gboolean enabled = FALSE;
-   GError *err = NULL;
diff --git a/extra/metacity/metacity-restartstyle.patch b/extra/metacity/metacity-restartstyle.patch
deleted file mode 100644
index 54dd79e02..000000000
--- a/extra/metacity/metacity-restartstyle.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From a3de65d5d1861f755ced7cad291fbbd4f1b8ef51 Mon Sep 17 00:00:00 2001
-From: Owen W. Taylor <otaylor@fishsoup.net>
-Date: Sat, 22 Aug 2009 15:00:57 -0400
-Subject: [PATCH] Should set RestartStyleHint to RestartIfRunning when replaced
-
-This reverts most of commit abbd057eb967e6ab462ffe305f41b2b04d417b25;
-
- - It's fine to call meta_session_shutdown() after the display
-   is closed, since it's talking over the ICE connection
- - We should not call warn_about_lame_clients_and_finish_interact()
-   unless we are interacting with the window manager in a session
-   save.
-
-However, the part of abbd057 that fixed accessing freed memory was
-fixing a real problem; this patches does the same thing in a simpler
-way by fixing an obvious type in meta_display_close() where it was
-NULL'ing out the local variable 'display' rather than the global
-variable 'the_display' and adding keeping the check in meta_finalize()
-that was added in abbd057.
-
-The order of calling meta_session_shutdown() and
-calling meta_display_close() is reverted back to the old order to
-make it clear that it's OK if the display way already closed previously.
-
-http://bugzilla.gnome.org/show_bug.cgi?id=588119
----
- src/core/display-private.h |    2 +-
- src/core/display.c         |   16 ++++------------
- src/core/main.c            |    5 ++---
- src/core/session.c         |    8 --------
- 4 files changed, 7 insertions(+), 24 deletions(-)
-
-diff --git a/src/core/display-private.h b/src/core/display-private.h
-index 19287f3..9c8ebc6 100644
---- a/src/core/display-private.h
-+++ b/src/core/display-private.h
-@@ -329,7 +329,7 @@ MetaScreen*   meta_display_screen_for_xwindow  (MetaDisplay *display,
- void          meta_display_grab                (MetaDisplay *display);
- void          meta_display_ungrab              (MetaDisplay *display);
- 
--void          meta_display_unmanage_screen     (MetaDisplay **display,
-+void          meta_display_unmanage_screen     (MetaDisplay *display,
-                                                 MetaScreen  *screen,
-                                                 guint32      timestamp);
- 
-diff --git a/src/core/display.c b/src/core/display.c
-index 55c374a..8e35a35 100644
---- a/src/core/display.c
-+++ b/src/core/display.c
-@@ -926,7 +926,7 @@ meta_display_close (MetaDisplay *display,
-     meta_compositor_destroy (display->compositor);
-   
-   g_free (display);
--  display = NULL;
-+  the_display = NULL;
- 
-   meta_quit (META_EXIT_SUCCESS);
- }
-@@ -4762,13 +4762,10 @@ process_selection_clear (MetaDisplay   *display,
-       meta_verbose ("Got selection clear for screen %d on display %s\n",
-                     screen->number, display->name);
-       
--      meta_display_unmanage_screen (&display, 
-+      meta_display_unmanage_screen (display, 
-                                     screen,
-                                     event->xselectionclear.time);
- 
--      if (!display)
--        the_display = NULL;
--
-       /* display and screen may both be invalid memory... */
-       
-       return;
-@@ -4790,12 +4787,10 @@ process_selection_clear (MetaDisplay   *display,
- }
- 
- void
--meta_display_unmanage_screen (MetaDisplay **displayp,
-+meta_display_unmanage_screen (MetaDisplay *display,
-                               MetaScreen  *screen,
-                               guint32      timestamp)
- {
--  MetaDisplay *display = *displayp;
--
-   meta_verbose ("Unmanaging screen %d on display %s\n",
-                 screen->number, display->name);
-   
-@@ -4805,10 +4800,7 @@ meta_display_unmanage_screen (MetaDisplay **displayp,
-   display->screens = g_slist_remove (display->screens, screen);
- 
-   if (display->screens == NULL)
--    {
--      meta_display_close (display, timestamp);
--      *displayp = NULL;
--    }
-+    meta_display_close (display, timestamp);
- }
- 
- void
-diff --git a/src/core/main.c b/src/core/main.c
-index a36a396..44d317e 100644
---- a/src/core/main.c
-+++ b/src/core/main.c
-@@ -361,12 +361,11 @@ static void
- meta_finalize (void)
- {
-   MetaDisplay *display = meta_get_display();
--
--  meta_session_shutdown ();
--
-   if (display)
-     meta_display_close (display,
-                         CurrentTime); /* I doubt correct timestamps matter here */
-+
-+  meta_session_shutdown ();
- }
- 
- static void
-diff --git a/src/core/session.c b/src/core/session.c
-index 7e3b389..0d69350 100644
---- a/src/core/session.c
-+++ b/src/core/session.c
-@@ -376,14 +376,6 @@ meta_session_shutdown (void)
-   SmProp *props[1];
-   char hint = SmRestartIfRunning;
- 
--  if (!meta_get_display ())
--    {
--      meta_verbose ("Cannot close session because there is no display");
--      return;
--    }
--
--  warn_about_lame_clients_and_finish_interact (FALSE);
--
-   if (session_connection == NULL)
-     return;
-   
--- 
-1.6.4
-\ No newline at end of file
diff --git a/extra/nautilus/nautilus-condrestart.patch b/extra/nautilus/nautilus-condrestart.patch
deleted file mode 100644
index 9634f35eb..000000000
--- a/extra/nautilus/nautilus-condrestart.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up nautilus-2.25.93/data/nautilus.desktop.in.condrestart nautilus-2.25.93/nautilus.desktop.in
---- nautilus-2.25.93/data/nautilus.desktop.in.condrestart	2009-03-12 10:49:41.449753624 -0400
-+++ nautilus-2.25.93/data/nautilus.desktop.in	2009-03-12 10:49:51.814754208 -0400
-@@ -17,3 +17,4 @@ X-GNOME-Autostart-Phase=Desktop
- X-GNOME-Autostart-Notify=true
- X-GNOME-AutoRestart=true
- X-GNOME-Provides=filemanager
-+AutostartCondition=GNOME /apps/nautilus/preferences/show_desktop
-diff -up nautilus-2.25.93/data/nautilus.desktop.in.in.condrestart nautilus-2.25.93/nautilus.desktop.in.in
---- nautilus-2.25.93/data/nautilus.desktop.in.in.condrestart	2009-03-12 10:47:41.681753834 -0400
-+++ nautilus-2.25.93/data/nautilus.desktop.in.in	2009-03-12 10:49:29.663754303 -0400
-@@ -17,3 +17,4 @@ X-GNOME-Autostart-Phase=Desktop
- X-GNOME-Autostart-Notify=true
- X-GNOME-AutoRestart=true
- X-GNOME-Provides=filemanager
-+AutostartCondition=GNOME /apps/nautilus/preferences/show_desktop
diff --git a/extra/network-manager-applet/nm-applet-0.8.2-libnotify-0.7.patch b/extra/network-manager-applet/nm-applet-0.8.2-libnotify-0.7.patch
deleted file mode 100644
index 54aa473af..000000000
--- a/extra/network-manager-applet/nm-applet-0.8.2-libnotify-0.7.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- src/applet.c
-+++ src/applet.c
-@@ -58,6 +58,10 @@
- #include <gnome-keyring.h>
- #include <libnotify/notify.h>
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- #include "applet.h"
- #include "applet-device-wired.h"
- #include "applet-device-wifi.h"
-@@ -626,12 +630,20 @@
- 	escaped = utils_escape_notify_message (message);
- 	notify = notify_notification_new (summary,
- 	                                  escaped,
--	                                  icon ? icon : GTK_STOCK_NETWORK,
--	                                  NULL);
-+	                                  icon ? icon : GTK_STOCK_NETWORK
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+					  );
-+#else
-+                                          , NULL);
-+#endif
- 	g_free (escaped);
- 	applet->notification = notify;
- 
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+        /* notify_notification_attach_to_status_icon was removed */
-+#else
- 	notify_notification_attach_to_status_icon (notify, applet->status_icon);
-+#endif
- 	notify_notification_set_urgency (notify, urgency);
- 	notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
- 
diff --git a/extra/notification-daemon/notification-daemon-0.4.0-libnotify-0.7.patch b/extra/notification-daemon/notification-daemon-0.4.0-libnotify-0.7.patch
deleted file mode 100644
index 8f5e4c909..000000000
--- a/extra/notification-daemon/notification-daemon-0.4.0-libnotify-0.7.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Nur notification-daemon-0.4.0.orig/src/capplet/notification-properties.c notification-daemon-0.4.0/src/capplet/notification-properties.c
---- notification-daemon-0.4.0.orig/src/capplet/notification-properties.c	2008-11-20 02:46:16.000000000 -0800
-+++ notification-daemon-0.4.0/src/capplet/notification-properties.c	2011-03-07 03:23:07.293334003 -0800
-@@ -28,6 +28,10 @@
- #include <string.h>
- #include <libnotify/notify.h>
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- #include "../daemon/stack.h"
- 
- #define GCONF_KEY_DAEMON         "/apps/notification-daemon"
-@@ -434,8 +438,12 @@
- 
- 	dialog->preview = notify_notification_new(_("Notification Test"),
- 											  _("Just a test"),
--											  "gnome-util",
--											  NULL);
-+											  "gnome-util"
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+                                                                                          );
-+#else
-+                                                                                           , NULL);
-+#endif
- 
- 	if (!notify_notification_show(dialog->preview, &error))
- 	{
diff --git a/extra/ntfs-3g/25-ntfs-config-write-policy.fdi b/extra/ntfs-3g/25-ntfs-config-write-policy.fdi
deleted file mode 100644
index 54195d8b3..000000000
--- a/extra/ntfs-3g/25-ntfs-config-write-policy.fdi
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deviceinfo version="0.2">
-  <device>
-   	<match key="volume.fstype" string="ntfs">
-        <append key="volume.fstype.alternative" type="copy_property">volume.fstype</append>
-        <merge key="volume.mount.ntfs.valid_options" type="copy_property">volume.mount.valid_options</merge>
-        <merge key="volume.unmount.ntfs.valid_options" type="copy_property">volume.unmount.valid_options</merge>
-        <merge key="volume.fstype" type="string">ntfs-3g</merge>
-       	<merge key="volume.mount.valid_options" type="strlist">ro</merge>
-        <append key="volume.mount.valid_options" type="strlist">atime</append>
-        <append key="volume.mount.valid_options" type="strlist">noatime</append>
-       	<append key="volume.mount.valid_options" type="strlist">relatime</append>
-       	<append key="volume.mount.valid_options" type="strlist">fake_rw</append>
-       	<append key="volume.mount.valid_options" type="strlist">no_def_opts</append>
-       	<append key="volume.mount.valid_options" type="strlist">default_permissions</append>
-       	<append key="volume.mount.valid_options" type="strlist">umask=</append>
-       	<append key="volume.mount.valid_options" type="strlist">fmask=</append>
-       	<append key="volume.mount.valid_options" type="strlist">dmask=</append>
-       	<append key="volume.mount.valid_options" type="strlist">uid=</append>
-       	<append key="volume.mount.valid_options" type="strlist">gid=</append>
-      	<append key="volume.mount.valid_options" type="strlist">show_sys_files</append>
-       	<append key="volume.mount.valid_options" type="strlist">silent</append>
-       	<append key="volume.mount.valid_options" type="strlist">force</append>
-       	<append key="volume.mount.valid_options" type="strlist">remove_hiberfile</append>
-       	<append key="volume.mount.valid_options" type="strlist">locale=</append>
-       	<append key="volume.mount.valid_options" type="strlist">streams_interface=</append>
-       	<append key="volume.mount.valid_options" type="strlist">debug</append>
-       	<append key="volume.mount.valid_options" type="strlist">no_detatch</append>
-       	<append key="volume.mount.valid_options" type="strlist">sync</append>
-       	<append key="volume.mount.valid_options" type="strlist">dirsync</append>
-       	<append key="volume.mount.valid_options" type="strlist">nodiratime</append>
-       	<append key="volume.mount.valid_options" type="strlist">noexec</append>
-        <append key="volume.mount.valid_options" type="strlist">quiet</append>
-       	<append key="volume.mount.valid_options" type="strlist">remount</append>
-       	<append key="volume.mount.valid_options" type="strlist">exec</append>
-       	<append key="volume.mount.valid_options" type="strlist">recover</append>
-       	<append key="volume.mount.valid_options" type="strlist">norecover</append>
-       	<merge key="volume.unmount.valid_options" type="strlist">lazy</merge>
-       	<merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
-	</match>
-  </device>
-</deviceinfo>
diff --git a/extra/ntfs-3g/PKGBUILD b/extra/ntfs-3g/PKGBUILD
deleted file mode 100644
index 0b1298ea3..000000000
--- a/extra/ntfs-3g/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 108992 2011-02-05 10:41:54Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Thomas B�chler <thomas.archlinux.org>
-
-pkgname=ntfs-3g
-pkgver=2011.1.15
-pkgrel=1
-pkgdesc="Stable read and write NTFS driver"
-url="http://www.tuxera.com"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
-depends=('glibc' 'fuse')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://www.tuxera.com/opensource/${pkgname}-${pkgver}.tgz
-        25-ntfs-config-write-policy.fdi)
-sha1sums=('d7cf0c5e8730568f5fa8802869d6fe8cdd4a0213'
-          '200029f2999a2c284fd30ae25734abf6459c3501')
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ac_cv_path_LDCONFIG=/bin/true ./configure --prefix=/usr \
-    --with-fuse=external --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  ln -s /bin/ntfs-3g "${pkgdir}/sbin/mount.ntfs"
-  install -m755 -d "${pkgdir}/usr/share/hal/fdi/policy/10osvendor"
-  install -m644 "${srcdir}/25-ntfs-config-write-policy.fdi" "${pkgdir}/usr/share/hal/fdi/policy/10osvendor/"
-}
diff --git a/extra/ntfsprogs/PKGBUILD b/extra/ntfsprogs/PKGBUILD
deleted file mode 100644
index 162dd9306..000000000
--- a/extra/ntfsprogs/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 48342 2009-08-01 14:46:45Z jgc $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=ntfsprogs
-pkgver=2.0.0
-pkgrel=4
-depends=('glibc' 'fuse' 'util-linux-ng>=2.16')
-makedepends=('pkgconfig')
-pkgdesc="NTFS filesystem utilities"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-source=(http://downloads.sourceforge.net/sourceforge/linux-ntfs/${pkgname}-${pkgver}.tar.gz)
-url="http://www.linux-ntfs.org/"
-options=(!libtool)
-md5sums=('2c402b647bb7aeb1d3f8ce1cc354fd68')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-gnome-vfs \
-      --mandir=/usr/share/man || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}
-
diff --git a/extra/octave/octave-3.2.0_as_needed.patch b/extra/octave/octave-3.2.0_as_needed.patch
deleted file mode 100644
index bce3e01a3..000000000
--- a/extra/octave/octave-3.2.0_as_needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur octave-3.2.0/liboctave/Makefile.in octave-3.2.0.new/liboctave/Makefile.in
---- octave-3.2.0/liboctave/Makefile.in	2009-05-25 02:04:59.000000000 -0400
-+++ octave-3.2.0.new/liboctave/Makefile.in	2009-07-10 10:32:09.000000000 -0400
-@@ -35,6 +35,7 @@
- DLL_CXXDEFS = @OCTAVE_DLL_DEFS@
- 
- LINK_DEPS = \
-+  -lpthread \
-   -L../libcruft -L. $(RLD_FLAG) \
-   $(LIBCRUFT) $(CHOLMOD_LIBS) $(UMFPACK_LIBS)  $(AMD_LIBS) \
-   $(CAMD_LIBS) $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) \
diff --git a/extra/octave/octave-3.2.0_parallel_make.patch b/extra/octave/octave-3.2.0_parallel_make.patch
deleted file mode 100644
index bcc2f7d29..000000000
--- a/extra/octave/octave-3.2.0_parallel_make.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur octave-3.2.0/doc/Makefile.in octave-3.2.0.new/doc/Makefile.in
---- octave-3.2.0/doc/Makefile.in	2009-06-03 07:55:40.000000000 -0400
-+++ octave-3.2.0.new/doc/Makefile.in	2009-07-07 18:20:14.000000000 -0400
-@@ -30,6 +30,8 @@
- all: conf.texi $(SUBDIRS)
- .PHONY: all
- 
-+$(SUBDIRS): conf.texi
-+
- conf.texi: conf.texi.in $(TOPDIR)/Makeconf
- 	@$(do-subst-texinfo-vals)
- 
diff --git a/extra/rhino/PKGBUILD b/extra/rhino/PKGBUILD
deleted file mode 100644
index 3badb3c40..000000000
--- a/extra/rhino/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=rhino
-pkgver=1.7R1
-pkgrel=1
-pkgdesc="Open-source implementation of JavaScript written entirely in Java"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.mozilla.org/rhino/"
-license=('MPL' 'GPL2')
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino1_7R1.zip)
-md5sums=('613eed8201d37be201805e5048ebb0c3')
-
-build() {
-  cd ${srcdir}/rhino1_7R1
-  install -m755 -d ${pkgdir}/usr/share/java
-  install -m644 js.jar ${pkgdir}/usr/share/java/ || return 1
-}
diff --git a/extra/seahorse/seahorse-2.32.0-libnotify-0.7.patch b/extra/seahorse/seahorse-2.32.0-libnotify-0.7.patch
deleted file mode 100644
index 1a6b478ac..000000000
--- a/extra/seahorse/seahorse-2.32.0-libnotify-0.7.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- libseahorse/seahorse-notification.c
-+++ libseahorse/seahorse-notification.c
-@@ -37,6 +37,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- /* -----------------------------------------------------------------------------
-@@ -231,7 +234,12 @@
-     heading = format_key_text (snotif->heading);
-     message = format_key_text (snotif->message);
-     
--    notif = notify_notification_new (heading, message, snotif->icon, attachto);
-+    notif = notify_notification_new (heading, message, snotif->icon
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+    );
-+#else
-+    , attachto);
-+#endif
-     
-     g_free (heading);
-     g_free (message);
diff --git a/extra/slim/slim b/extra/slim/slim
deleted file mode 100755
index b0be7ffc5..000000000
--- a/extra/slim/slim
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/slim`
-case "$1" in
-  start)
-    stat_busy "Starting Simple Login Manager"
-    [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon slim
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Simple Login Manager"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon slim
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/extra/slim/slim.install b/extra/slim/slim.install
deleted file mode 100644
index 65aa77d72..000000000
--- a/extra/slim/slim.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  cat <<EOF
-
-==> Add slim to the DAEMONS array in /etc/rc.conf or update /etc/inittab.
-
-EOF
-}
diff --git a/extra/slim/slim.logrotate b/extra/slim/slim.logrotate
deleted file mode 100644
index 26ec3b0f4..000000000
--- a/extra/slim/slim.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/slim.log {
-    compress
-    rotate 1
-    size 1024k
-    notifempty
-    missingok
-    copytruncate
-    noolddir
-}
diff --git a/extra/slim/slim.pam b/extra/slim/slim.pam
deleted file mode 100644
index 78a981f74..000000000
--- a/extra/slim/slim.pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-password        required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_loginuid.so
-session         optional        pam_ck_connector.so
diff --git a/extra/xarchiver/ChangeLog b/extra/xarchiver/ChangeLog
deleted file mode 100644
index c3abc0d0e..000000000
--- a/extra/xarchiver/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2008-11-27  Alexander Fehr  <pizzapunk gmail com>
-
-  * xarchiver-0.5.2-1:
-  New upstream release.
-  New maintainer.
-  Changed license to GPL.
-  Added dependencies on desktop-file-utils and hicolor-icon-theme.
-  Replaced install message with optdepends.
-  Added ChangeLog.
diff --git a/extra/zenity/zenity-2.32.1-libnotify-0.7.patch b/extra/zenity/zenity-2.32.1-libnotify-0.7.patch
deleted file mode 100644
index 4d5bf7447..000000000
--- a/extra/zenity/zenity-2.32.1-libnotify-0.7.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/notification.c
-+++ src/notification.c
-@@ -30,6 +30,9 @@
- 
- #ifdef HAVE_LIBNOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #endif
- 
- #include "zenity.h"
-@@ -184,10 +187,14 @@
-             icon = freeme = g_filename_to_uri (icon_file, NULL, NULL);
-           }
- 
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+          /* notify_notification_new_with_status_icon was removed */
-+#else
-           notif = notify_notification_new_with_status_icon (
-                               message[0] /* title */,
-                               message[1] /* summary */,
-                               icon, status_icon);
-+#endif
- 
-           g_strfreev (message);
-           g_free (freeme);
diff --git a/extra/zip/ChangeLog b/extra/zip/ChangeLog
deleted file mode 100644
index bc7e1fb02..000000000
--- a/extra/zip/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-2008-08-10  Eric Belanger  <eric@archlinux.org>
-
-	* zip 3.0-1
-	* Removed zcrypt reference as it's now included in zip 3.0
-	* Added bzip2 depends
-	* Added license
-	* FHS man pages
-	* Disabled SMP build
-
-2008-07-27  Douglas Soares de Andrade  <douglas@archlinux.org>
-	
-	* Updating for i686: 3.0
-
diff --git a/multilib-testing/lib32-gdk-pixbuf2/PKGBUILD b/multilib-testing/lib32-gdk-pixbuf2/PKGBUILD
deleted file mode 100644
index 5aeb0f1bc..000000000
--- a/multilib-testing/lib32-gdk-pixbuf2/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 91063 2010-09-21 19:21:24Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-_pkgbasename=gdk-pixbuf2
-pkgname=lib32-$_pkgbasename
-pkgver=2.23.3
-pkgrel=1
-pkgdesc="An image loading library for gtk2 (32-bit)"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('lib32-glib2>=2.25.15'
-          lib32-lib{'png>=1.4.3','tiff>=3.9.4','jpeg>=8.0.2',x11}
-          $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool' '!docs')
-install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/2.23/gdk-pixbuf-${pkgver}.tar.bz2)
-sha256sums=('9faba780151c02e13cb2029d512c975e9c41b98cd72de6d2cc50e4af10a5e76a')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
-
-  ./configure --prefix=/usr  --libdir=/usr/lib32 \
-    --without-libjasper \
-    --with-included-loaders=png
-  make
-}
-
-package() {
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  cd "${pkgdir}"/usr/bin
-  mv gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-32
-  rm gdk-pixbuf-csource
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib-testing/lib32-gdk-pixbuf2/gdk-pixbuf2.install b/multilib-testing/lib32-gdk-pixbuf2/gdk-pixbuf2.install
deleted file mode 100644
index 92d58ef04..000000000
--- a/multilib-testing/lib32-gdk-pixbuf2/gdk-pixbuf2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gdk-pixbuf-query-loaders-32 --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
-}
diff --git a/multilib-testing/lib32-glib2/PKGBUILD b/multilib-testing/lib32-glib2/PKGBUILD
deleted file mode 100644
index 4d98d0693..000000000
--- a/multilib-testing/lib32-glib2/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 45657 2011-04-26 16:44:11Z svenstaro $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-_pkgbasename=glib2
-pkgname=lib32-$_pkgbasename
-pkgver=2.28.6
-pkgrel=1
-pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)"
-url="http://www.gtk.org/"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' $_pkgbasename)
-makedepends=('gcc-multilib')
-options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.bz2)
-sha256sums=('557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/glib-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \
-      --enable-static --enable-shared --with-pcre=system --disable-fam
-  make
-}
-
-package() {
-  cd "${srcdir}/glib-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/{etc,usr/{share,include}}
-
-  cd "${pkgdir}"/usr/bin
-  mv gio-querymodules gio-querymodules-32
-  rm -f gdbus glib* gobject-query gsettings gtester*
-}
diff --git a/multilib-testing/lib32-gtk2/PKGBUILD b/multilib-testing/lib32-gtk2/PKGBUILD
deleted file mode 100644
index ae67618c0..000000000
--- a/multilib-testing/lib32-gtk2/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 45659 2011-04-26 16:47:39Z svenstaro $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-
-_pkgbasename=gtk2
-pkgname=lib32-$_pkgbasename
-pkgver=2.24.4
-pkgrel=1
-pkgdesc="The GTK+ Toolkit (v2) (32-bit)"
-arch=('x86_64')
-url="http://www.gtk.org/"
-install=gtk2.install
-depends=(lib32-{'atk>=1.30.0','pango>=1.28.0','cairo>=1.10.0','heimdal>=1.3.2','gnutls>=2.8.6','gdk-pixbuf2>=2.22.1'}
-         lib32-lib{'cups>=1.4.4',xcursor,'xrandr>=1.3','xi>=1.3',xinerama,xcomposite,xdamage}
-         $_pkgbasename)
-makedepends=('pkgconfig' 'gcc-multilib')
-options=('!libtool' '!docs')
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.bz2
-        xid-collision-debug.patch
-        gtk-modules-32.patch)
-sha256sums=('7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
-            '2effb13404442ae266d4c663347e88cd1ca19e9a83b452da1743bac16af9c7b0')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/gtk+-${pkgver}"
-  patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
-  patch -p1 -i ${srcdir}/gtk-modules-32.patch
-
-  CXX=/bin/false ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libdir=/usr/lib32 \
-      --with-xinput=yes
-  make
-}
-
-package() {
-  cd "${srcdir}/gtk+-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  cd "${pkgdir}"/usr/bin
-  mv gtk-query-immodules-2.0 gtk-query-immodules-2.0-32
-  rm -f gtk-builder-convert gtk-demo gtk-update-icon-cache
-}
diff --git a/multilib-testing/lib32-gtk2/gtk-modules-32.patch b/multilib-testing/lib32-gtk2/gtk-modules-32.patch
deleted file mode 100644
index a2530c3bf..000000000
--- a/multilib-testing/lib32-gtk2/gtk-modules-32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gtk+-2.20.1/gtk/gtkrc.c gtk+-2.20.1-32/gtk/gtkrc.c
---- gtk+-2.20.1/gtk/gtkrc.c	2010-05-03 01:28:21.000000000 +0200
-+++ gtk+-2.20.1-32/gtk/gtkrc.c	2010-08-26 07:22:42.316920033 +0200
-@@ -450,7 +450,7 @@
-       if (im_module_file)
- 	result = g_strdup (im_module_file);
-       else
--	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-32", NULL);
-     }
- 
-   return result;
diff --git a/multilib-testing/lib32-gtk2/gtk2.install b/multilib-testing/lib32-gtk2/gtk2.install
deleted file mode 100644
index 49f86f550..000000000
--- a/multilib-testing/lib32-gtk2/gtk2.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  GTK_PATH=/usr/lib32/gtk-2.0 usr/bin/gtk-query-immodules-2.0-32 > etc/gtk-2.0/gtk.immodules-32
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  rm -f etc/gtk-2.0/gtk.immodules-32 &>/dev/null
-  rm -f etc/gtk-2.0/gdk-pixbuf.loaders-32 &>/dev/null
-}
diff --git a/multilib-testing/lib32-gtk2/xid-collision-debug.patch b/multilib-testing/lib32-gtk2/xid-collision-debug.patch
deleted file mode 100644
index d61238c3b..000000000
--- a/multilib-testing/lib32-gtk2/xid-collision-debug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gtk+-2.18.3/gdk/x11/gdkxid.c	2009-06-19 04:59:18.000000000 +0200
-+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new	2009-07-22 11:30:12.000000000 +0200
-@@ -56,10 +56,10 @@
-   if (!display_x11->xid_ht)
-     display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
- 					    (GEqualFunc) gdk_xid_equal);
--
-+/*
-   if (g_hash_table_lookup (display_x11->xid_ht, xid))
-     g_warning ("XID collision, trouble ahead");
--
-+*/
-   g_hash_table_insert (display_x11->xid_ht, xid, data);
- }
- 
diff --git a/testing/accountsservice/PKGBUILD b/testing/accountsservice/PKGBUILD
deleted file mode 100644
index 72c0277fc..000000000
--- a/testing/accountsservice/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 119834 2011-04-15 16:41:54Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=accountsservice
-pkgver=0.6.9
-pkgrel=1
-pkgdesc="D-Bus interface for user account query and manipulation"
-arch=(i686 x86_64 'mips64el')
-url="http://cgit.freedesktop.org/accountsservice/"
-license=('GPL3')
-depends=('dbus-glib' 'polkit')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e21a311d11089386eaf7d738f7bca222')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/accountsservice \
-    --with-systemdsystemunitdir=/lib/systemd/system \
-    --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/anjuta/PKGBUILD b/testing/anjuta/PKGBUILD
deleted file mode 100644
index 3e09aad25..000000000
--- a/testing/anjuta/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 120797 2011-04-26 15:26:51Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Harley Laue <losinggeneration@yahoo.com>
-
-pkgname=anjuta
-pkgver=3.0.1.0
-pkgrel=1
-pkgdesc="GNOME Integrated Development Environment (IDE)"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('vte3' 'gdl' 'autogen' 'devhelp' 'gtksourceview3' 'glade' 'libgda'
-         'subversion' 'gnome-icon-theme' 'hicolor-icon-theme' 'vala' 'graphviz'
-         'python2' 'shared-mime-info' 'desktop-file-utils')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-url="http://anjuta.sourceforge.net/"
-install=anjuta.install
-source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool' '!emptydirs')
-sha256sums=('dbda189f453e0f9baecb35e85d59df92613668f7f4be08207d635cff3abb7261')
-
-build() {
-  cd "${srcdir}/anjuta-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package(){
-  cd "${srcdir}/anjuta-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  sed -i "1s|#!/usr/bin/python$|&2|" \
-    $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py
-}
diff --git a/testing/anjuta/anjuta.install b/testing/anjuta/anjuta.install
deleted file mode 100644
index c6fcfec11..000000000
--- a/testing/anjuta/anjuta.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-  update-mime-database usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall anjuta
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/ardour/PKGBUILD b/testing/ardour/PKGBUILD
deleted file mode 100644
index 770a8d0a2..000000000
--- a/testing/ardour/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 110738 2011-02-21 22:15:44Z schiv $
-# Maintainer: tobias <tobias@archlinux.org>
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-# ardour, liblrdf and raptor are heavily dependent on each other. Updating of
-# one package mostly will require an update of all the other packages. I vote
-# for fixed dependencies speaking in terms of versions
-
-pkgname=ardour
-pkgver=2.8.11
-pkgrel=3
-pkgdesc="A multichannel hard disk recorder and digital audio workstation"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://ardour.org"
-license=('GPL')
-depends=('liblrdf>=0.4.0-7' 'liblo' 'aubio' 'libusb-compat'
-         'slv2>=0.6.6-3' 'rubberband' 'libgnomecanvas')
-makedepends=('scons' 'boost' 'pkg-config')
-changelog=${pkgname}.changelog
-source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2
-        ${pkgname}.desktop)
-md5sums=('f451a8d0abc133a1700c3932e07a5612'
-         '8aeaf433ebf781733db48e5a16b0c4da')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i '/-O3/d' SConstruct
-
-  scons ${MAKEFLAGS} ARCH="${CFLAGS}" \
-                     PREFIX="/usr" \
-                     DIST_LIBDIR="lib" \
-                     FREEDESKTOP=0 \
-                     FREESOUND=1 \
-                     DESTDIR="${pkgdir}"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  scons PREFIX="/usr" \
-        FREEDESKTOP=0 \
-        FREESOUND=1 \
-        DESTDIR="${pkgdir}" install
-
-  # install some freedesktop.org compatibility
-  install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/ardour/ardour.changelog b/testing/ardour/ardour.changelog
deleted file mode 100644
index ee9cf00bf..000000000
--- a/testing/ardour/ardour.changelog
+++ /dev/null
@@ -1,26 +0,0 @@
-22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 2.8.11-2 :
-	raptor rebuild	
-
-9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 2.8.11-1 :
-	Testing build.
-	Removed libgnomecanvasmm depend (ardour internal).
-	Removed soundtouch makedepend (ardour internal, unneded).
-	Added new depends
-		- slv2 ("LV2" plug-ins support)
-		- rubberband (can "do more" than soundtouch)
-		- libgnomecanvas
-	Not using SYSLIBS because upstream does not support it.
-	Namcap warnings can be ignored; they're ardour internals.
-
-	* PKGBUILD :
-	Minor cosmetic ammendments.
-
-	* ardour.changelog :
-	Added this changelog.
-
-	* ardour.install :
-	Removed install scriptlet; old and deprecated information.
diff --git a/testing/ardour/ardour.desktop b/testing/ardour/ardour.desktop
deleted file mode 100644
index b50f6c952..000000000
--- a/testing/ardour/ardour.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Ardour
-Comment=Multitrack hard disk recorder
-Exec=ardour2
-Icon=/usr/share/ardour2/icons/ardour_icon_48px.png
-Terminal=false
-Type=Application
-X-MultipleArgs=false
-Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video;
diff --git a/testing/at-spi/PKGBUILD b/testing/at-spi/PKGBUILD
deleted file mode 100644
index 82cc1b4ec..000000000
--- a/testing/at-spi/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 120762 2011-04-26 14:25:06Z ibiru $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-
-pkgname=at-spi
-pkgver=1.32.0
-pkgrel=4
-pkgdesc="Assistive Technology Service Provider Interface"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libbonobo' 'libxtst' 'gtk2' 'gconf')
-makedepends=('pkgconfig' 'python2' 'intltool' 'libice' 'libsm')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=at-spi.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.32/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('cc841dea746413eebadf0710dabec741450b37a06821c34526f505fe9d027039')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/at-spi \
-      --enable-relocate
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain at-spi "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/at-spi/at-spi.install b/testing/at-spi/at-spi.install
deleted file mode 100644
index b4c75b51c..000000000
--- a/testing/at-spi/at-spi.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=at-spi
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/at-spi2-atk/PKGBUILD b/testing/at-spi2-atk/PKGBUILD
deleted file mode 100644
index e0034efe3..000000000
--- a/testing/at-spi2-atk/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 120714 2011-04-26 05:27:06Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=at-spi2-atk
-pkgver=2.0.1
-pkgrel=1
-pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('at-spi2-core' 'libx11' 'atk' 'dconf')
-makedepends=('intltool')
-install=at-spi2-atk.install
-options=('!libtool')
-groups=('gnome')
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d78a88067a53db479d3c7c1ce31f095b1d4962e44e653800a12599ade397dafc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf --force --install
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/at-spi2-atk/at-spi2-atk.install b/testing/at-spi2-atk/at-spi2-atk.install
deleted file mode 100644
index 2ef26aaa9..000000000
--- a/testing/at-spi2-atk/at-spi2-atk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/at-spi2-core/PKGBUILD b/testing/at-spi2-core/PKGBUILD
deleted file mode 100644
index f826d6763..000000000
--- a/testing/at-spi2-core/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 120767 2011-04-26 14:35:02Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=at-spi2-core
-pkgver=2.0.1
-pkgrel=1
-pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('dbus-core' 'glib2' 'libxtst')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-groups=('gnome')
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f0880d816a554c0560e9f6aea786614e8ab439e17189d383a83ed7eebd9e328b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf --force --install
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/at-spi2-core --disable-xevie
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/atk/PKGBUILD b/testing/atk/PKGBUILD
deleted file mode 100644
index 91d1f1e3a..000000000
--- a/testing/atk/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 118010 2011-04-05 06:45:40Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=atk
-pkgver=2.0.0
-pkgrel=1
-pkgdesc="A library providing a set of interfaces for accessibility"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL')
-depends=('glib2')
-makedepends=('pkgconfig' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-url='http://www.gtk.org/'
-sha256sums=('5dbdc35f7f5b3f0748039bb3faa7cd5e45ec3d337a539772bc73acd0dfb55afd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/atkmm/PKGBUILD b/testing/atkmm/PKGBUILD
deleted file mode 100644
index db30facf8..000000000
--- a/testing/atkmm/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 79583 2010-05-04 15:21:15Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgbase=atkmm
-pkgname=(atkmm atkmm-docs)
-pkgver=2.22.4
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-makedepends=('atk' 'glibmm' 'glibmm-docs' 'libsigc++')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-url="http://gtkmm.sourceforge.net/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.22/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('c47ac8866fd0be695b6ba54a7cda5ab94676295ec5b2c22bd159bb8212aca438')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package_atkmm() {
-  pkgdesc="C++ bindings for atk"
-  depends=('atk' 'glibmm' 'libsigc++')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-  make DESTDIR="${pkgdir}" install
-}
-
-package_atkmm-docs() {
-  pkgdesc="Developer documentation for atkmm"
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C doc DESTDIR="${pkgdir}" install
-}
diff --git a/testing/avahi/ChangeLog b/testing/avahi/ChangeLog
deleted file mode 100644
index 57984a3b2..000000000
--- a/testing/avahi/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-
-2009-04-23  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 0.6.25
-
-2009-03-21  Eric Belanger  <eric@archlinux.org>
-
-	* Added optdepends for avahi-discover (close FS#11250)
-
-2009-01-04  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 0.6.24
-
-2008-07-22  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 0.6.23
-
diff --git a/testing/avahi/PKGBUILD b/testing/avahi/PKGBUILD
deleted file mode 100644
index ad6efeb13..000000000
--- a/testing/avahi/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 118164 2011-04-05 16:57:59Z bisson $
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=avahi
-pkgver=0.6.30
-pkgrel=2
-pkgdesc='A multicast/unicast DNS-SD framework'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.avahi.org/'
-license=('LGPL')
-depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
-            'gtk2: gtk2 bindings'
-            'pygtk: avahi-bookmarks, avahi-discover'
-            'twisted: avahi-bookmarks'
-            'dbus-python: avahi-discover'
-            'nss-mdns: NSS support for mDNS')
-makedepends=('pygtk' 'intltool' 'dbus-python'
-             'gobject-introspection' 'gtk3')
-backup=(etc/avahi/avahi-daemon.conf etc/avahi/services/{sftp-,}ssh.service)
-install=avahi.install
-conflicts=('howl' 'mdnsresponder')
-provides=('howl' 'mdnsresponder')
-replaces=('howl' 'mdnsresponder')
-options=('!libtool')
-source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz
-        avahi-daemon-dbus.patch
-        gnome-nettool.png)
-sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06'
-          '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61'
-          'cf56387c88aed246b9f435efc182ef44de4d52f3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf
-  patch -Np0 -i "${srcdir}/avahi-daemon-dbus.patch"
-
-  # pygtk requires python2; make it explicit in case other python are installed: FS#21865
-  PYTHON=python2 \
-  PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \
-    ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-static \
-    --disable-qt4 \
-    --disable-qt3 \
-    --disable-mono \
-    --disable-monodoc \
-    --disable-doxygen-doc \
-    --disable-xmltoman \
-    --enable-compat-libdns_sd \
-    --enable-compat-howl \
-    --with-distro=archlinux \
-    --with-avahi-priv-access-group=network \
-    --with-autoipd-user=avahi \
-    --with-autoipd-group=avahi \
-    --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  # howl and mdnsresponder compatability
-  cd "${pkgdir}"/usr/include
-  ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h
-  ln -s avahi-compat-howl howl
-  cd "${pkgdir}"/usr/lib/pkgconfig
-  ln -s avahi-compat-howl.pc howl.pc
-
-  sed -i '1c #!/usr/bin/python2' "$pkgdir"/usr/bin/avahi-{bookmarks,discover}
-
-  install -D -m 644 "${srcdir}"/gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png
-}
diff --git a/testing/avahi/avahi-daemon-dbus.patch b/testing/avahi/avahi-daemon-dbus.patch
deleted file mode 100644
index a168f0387..000000000
--- a/testing/avahi/avahi-daemon-dbus.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- initscript/archlinux/avahi-daemon.in	2010-08-17 22:23:46.510293144 +0200
-+++ initscript/archlinux/avahi-daemon.in	2010-08-17 22:46:58.110163026 +0200
-@@ -33,6 +35,8 @@
- 
- case "$1" in
-     start)
-+        ck_daemon dbus && /etc/rc.d/dbus start
-+        modprobe capability &> /dev/null
-         stat_busy "Starting $DESC"
-         $DAEMON -D > /dev/null 2>&1
-         if [ $? -gt 0 ]; then
diff --git a/testing/avahi/avahi.install b/testing/avahi/avahi.install
deleted file mode 100644
index 7c75c3dd4..000000000
--- a/testing/avahi/avahi.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-  getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
-  getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
-
-  cat <<EOF
-==> The following daemons may be added to DAEMONS in /etc/rc.conf:
-==> avahi-daemon: the mdns responder, you probably want this.
-==>               dbus needs to be running when you start it.
-==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns
-==>                 configuration on dhcp-less networks.
-
-==> To use some of the client applications you will have to install python.
-==> In addition, pygtk is required for the graphical ones and
-==> twisted for avahi-bookmarks.
-EOF
-}
-
-post_remove() {
-  getent passwd avahi &>/dev/null && userdel avahi >/dev/null
-  getent group avahi &>/dev/null && groupdel avahi >/dev/null
-}
diff --git a/testing/avahi/gnome-nettool.png b/testing/avahi/gnome-nettool.png
deleted file mode 100644
index 227d0678a..000000000
--- a/testing/avahi/gnome-nettool.png
+++ /dev/null
diff --git a/testing/banshee/PKGBUILD b/testing/banshee/PKGBUILD
deleted file mode 100644
index f3850002e..000000000
--- a/testing/banshee/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 119748 2011-04-14 13:27:14Z jgc $
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=banshee
-pkgver=2.0.0
-pkgrel=3
-pkgdesc="Music management and playback for GNOME"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://banshee.fm/"
-license=('MIT')
-depends=('libxxf86vm' 'mono-addins' 'notify-sharp-svn' 'boo' 'libwebkit' 'gdata-sharp' 'gtk-sharp-beans' 'gudev-sharp' 'gkeyfile-sharp' 'taglib-sharp' 'libmtp' 'libgpod' 'mono-zeroconf' 'gstreamer0.10-base-plugins' 'desktop-file-utils' 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'gconf-sharp')
-makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
-            'gstreamer0.10-ugly-plugins: Extra media codecs'
-            'gstreamer0.10-bad-plugins: Extra media codecs'
-            'gstreamer0.10-ffmpeg: Extra media codecs'
-            'brasero: CD burning')
-options=('!libtool')
-install=$pkgname.install
-source=(http://download.banshee.fm/$pkgname/stable/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('ecd129a3232bda507b98c90e6f9272cf')
-
-build() {
-  export MONO_SHARED_DIR="$srcdir/.wabi"
-  mkdir -p "$MONO_SHARED_DIR"
-
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-docs \
-              --disable-static \
-              --disable-scrollkeeper \
-              --disable-ipod --disable-hal \
-              --with-vendor-build-id=ArchLinux
-  make
-}
-
-package() {
-  export MONO_SHARED_DIR="$srcdir/.wabi"
-  mkdir -p "$MONO_SHARED_DIR"
-
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/testing/banshee/banshee.install b/testing/banshee/banshee.install
deleted file mode 100644
index 1d0fd332b..000000000
--- a/testing/banshee/banshee.install
+++ /dev/null
@@ -1,15 +0,0 @@
-pkgname=banshee
-
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/brasero/PKGBUILD b/testing/brasero/PKGBUILD
deleted file mode 100644
index 3f082cac3..000000000
--- a/testing/brasero/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 117967 2011-04-05 06:28:22Z heftig $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=brasero
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="A disc burning application for Gnome"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnome.org/projects/brasero"
-license=('GPL')
-options=('!libtool' '!emptydirs')
-depends=('gtk3' 'gstreamer0.10-base-plugins' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'  'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm')
-makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf')
-optdepends=('libburn: alternative back-end'
-            'libisofs: libburn back-end'
-            'dvdauthor: video project'
-            'gstreamer0.10-bad-plugins: video project'
-            'vcdimager: video project')
-replaces=('nautilus-cd-burner')
-install=brasero.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('aff1e900d6c68096e43a80443c8c367374fb980986d2f823d229606605a410e3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-caches \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/brasero/brasero.install b/testing/brasero/brasero.install
deleted file mode 100644
index b6c57055e..000000000
--- a/testing/brasero/brasero.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/cairomm/PKGBUILD b/testing/cairomm/PKGBUILD
deleted file mode 100644
index 498fb790f..000000000
--- a/testing/cairomm/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 109789 2011-02-12 19:30:52Z ibiru $
-# Maintainer: Kevin <kevin@archlinux.org>
-# Contributor: criminy <criminy@gmail.com>
-
-pkgname=cairomm
-pkgver=1.9.8
-pkgrel=1
-pkgdesc="C++ bindings to Cairo vector graphics library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.cairographics.org"
-license=('LGPL' 'MPL')
-depends=('cairo' 'libsigc++')
-makedepends=('pkgconfig')
-source=(http://www.cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
-options=('!libtool' '!emptydirs')
-md5sums=('6d5ce1138dbb09c58038ab6f766d5e88')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/cheese/PKGBUILD b/testing/cheese/PKGBUILD
deleted file mode 100644
index 28365ff5e..000000000
--- a/testing/cheese/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 120785 2011-04-26 15:12:27Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=cheese
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'clutter-gst'
-         'clutter-gtk' 'mx' 'libgee' 'gnome-video-effects' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool' 'gobject-introspection')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org/projects/cheese/"
-install=cheese.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a2e947146c83d60db2e4f858917c906733037f77067a7081de7a2ff3716fbe7a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper \
-      --disable-static --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/cheese/cheese.install b/testing/cheese/cheese.install
deleted file mode 100644
index c042fba42..000000000
--- a/testing/cheese/cheese.install
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=cheese
-
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-   if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then
-       usr/sbin/gconfpkg --uninstall $pkgname
-   fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/claws-mail-extra-plugins/PKGBUILD b/testing/claws-mail-extra-plugins/PKGBUILD
deleted file mode 100644
index b1cd6cbc9..000000000
--- a/testing/claws-mail-extra-plugins/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 121174 2011-04-29 06:49:28Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Mildred <mildred593 at online dot fr>
-
-pkgname=claws-mail-extra-plugins
-pkgver=3.7.9
-pkgrel=3
-pkgdesc="Extra plugins for claws-mail"
-url="http://www.claws-mail.org/plugins.php?branch=EXT"
-license=('GPL3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('claws-mail>=3.7.8')
-makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7'
-             'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.3.13'
-             'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra')
-optdepends=('libgtkhtml: for gtkhtml2_viewer plugin'
-            'perl: for perl plugin'
-            'libnotify: for notification plugin'
-            'libcanberra: for notification plugin'
-            'dbus-core: for notification plugin'
-            'libxml2: for gtkhtml2_viewer and rssyl plugins'
-            'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins'
-            'libarchive: for archive plugin'
-            'libytnef: for tnef_parse plugin'
-            'libwebkit: for the fancy webkit html plugin'
-            'libsoup-gnome: for the fancy webkit html plugin'
-            'python2: for python plugin')
-conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin'
-           'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin'
-           'sylpheed-claws-extra-plugins' 'claws-tnef-plugin'
-           'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn')
-replaces=('sylpheed-claws-extra-plugins')
-options=('!libtool' '!strip')
-source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2
-        claws-mail-notification-0.26-libnotify-0.7.patch)
-md5sums=('3d1ebc48f686ab10702380c776b5d5d0'
-         'a02be84594ebd28b18811ccc358509be')
-
-build() {
-  cd "$srcdir/claws-mail-extra-plugins-$pkgver"
-
-  # fix for python2
-  export PYTHON="/usr/bin/python2"
-
-  for dir in */; do
-    [[ $dir != geolocation_plugin-* ]] && (
-      cd $dir
-
-      [[ $dir == notification_plugin-* ]] &&
-        patch -Np2 -i "$srcdir/claws-mail-notification-0.26-libnotify-0.7.patch"
-
-      ./configure --prefix=/usr --disable-static
-      make
-    )
-  done
-}
-
-package() {
-  cd "$srcdir/claws-mail-extra-plugins-$pkgver"
-  for dir in */; do
-    [[ $dir != geolocation_plugin-* ]] && 
-      make -C $dir DESTDIR="$pkgdir" install
-  done
-
-  # fix fileconflict with libical, #11485
-  rm -f "$pkgdir/usr/include/ical.h"
-}
diff --git a/testing/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch b/testing/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch
deleted file mode 100644
index efc06a472..000000000
--- a/testing/claws-mail-extra-plugins/claws-mail-notification-0.26-libnotify-0.7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c
---- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_popup.c	2009-04-26 03:05:05.000000000 +0200
-+++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_popup.c	2010-11-12 13:39:02.363909583 +0100
-@@ -339,7 +339,7 @@
-     break;
-   }
- 
--  ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL);
-+  ppopup->notification = notify_notification_new(summary, utf8_str, NULL);
-   g_free(utf8_str);
-   if(ppopup->notification == NULL) {
-     debug_print("Notification Plugin: Failed to create a new "
-diff -Nur claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c
---- claws-mail-extra-plugins-3.7.6-orig/notification_plugin-0.25/src/notification_trayicon.c	2010-03-25 09:56:34.000000000 +0100
-+++ claws-mail-extra-plugins-3.7.6/notification_plugin-0.25/src/notification_trayicon.c	2010-11-12 13:38:30.809340907 +0100
-@@ -589,8 +589,7 @@
-   summary  = notification_trayicon_popup_assemble_summary();
-   utf8_str = notification_trayicon_popup_assemble_body(msginfo);
- 
--  popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL);
--  notify_notification_attach_to_status_icon(popup.notification, trayicon);
-+  popup.notification = notify_notification_new(summary, utf8_str, NULL);
- 
-   g_free(summary);
-   g_free(utf8_str);
diff --git a/testing/clutter-gst/PKGBUILD b/testing/clutter-gst/PKGBUILD
deleted file mode 100644
index b07d15bd2..000000000
--- a/testing/clutter-gst/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 118181 2011-04-05 18:32:42Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-pkgname=clutter-gst
-pkgver=1.3.8
-pkgrel=1
-pkgdesc="GStreamer bindings for clutter"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('clutter' 'gstreamer0.10-base')
-makedepends=('gobject-introspection' 'gtk-doc')
-options=('!libtool')
-source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('376c069bed2a6b374d96615b7196cb5f6ee4bbbd94243f92b64dee3ec56aec28')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/clutter-gtk/PKGBUILD b/testing/clutter-gtk/PKGBUILD
deleted file mode 100644
index fc291a045..000000000
--- a/testing/clutter-gtk/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 118087 2011-04-05 12:00:37Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=clutter-gtk
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="GTK clutter widget"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('clutter' 'gtk3')
-makedepends=('gobject-introspection' 'gtk-doc')
-source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('5d395218e30e2971dbf9ca69e564036e6b6316e2d995b93fef11c0195f136cdb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/clutter-gtk2/PKGBUILD b/testing/clutter-gtk2/PKGBUILD
deleted file mode 100644
index 3ba9ffa2d..000000000
--- a/testing/clutter-gtk2/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 113313 2011-03-08 12:29:48Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=clutter-gtk2
-_pkgbasename=clutter-gtk
-pkgver=0.10.8
-pkgrel=1
-pkgdesc="GTK clutter widget"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('clutter' 'gtk2')
-makedepends=('gobject-introspection' 'gtk-doc')
-source=(http://www.clutter-project.org/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2
-        gir.patch)
-sha256sums=('7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814'
-            'a7bb2e41b155a293fef3a58f9d0486788564a5da9373b00cc5209bdbdcb1ec66')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  patch -Np1 -i "$srcdir/gir.patch"
-  autoreconf -i
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -r "$pkgdir/usr/share/gtk-doc"
-}
diff --git a/testing/clutter-gtk2/gir.patch b/testing/clutter-gtk2/gir.patch
deleted file mode 100644
index 81b56f3a1..000000000
--- a/testing/clutter-gtk2/gir.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4de105a2bbd201c8e60f3e8777794a4cd532afdc Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@linux.intel.com>
-Date: Tue, 28 Sep 2010 13:52:25 +0000
-Subject: build: Add common CFLAGS to the introspection scanner
-
----
-diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
-index 6e267b4..cec5cce 100644
---- a/clutter-gtk/Makefile.am
-+++ b/clutter-gtk/Makefile.am
-@@ -15,6 +15,8 @@ AM_CPPFLAGS = \
- 	-DCLUTTER_DISABLE_DEPRECATED		\
- 	$(CLUTTER_GTK_DEBUG_CFLAGS)
- 
-+common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
-+
- # please, keep these lists sorted alphabetically
- sources_c = \
- 	$(srcdir)/gtk-clutter-embed.c 		\
-@@ -36,7 +38,7 @@ lib_LTLIBRARIES = libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
- libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
- libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
- libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
--libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS) 
-+libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS)
- 
- cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk
- cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h
-@@ -48,7 +50,7 @@ GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libc
- 	$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
- 		--namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
- 		--strip-prefix=GtkClutter \
--		$(INCLUDES) $(AM_CPPFLAGS) \
-+		$(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \
- 		--add-include-path=$(srcdir) --add-include=path=. \
- 		--include=Clutter-1.0 \
- 		--include=GdkPixbuf-2.0 \
---
-cgit v0.8.3.1-30-gff3a
diff --git a/testing/clutter/PKGBUILD b/testing/clutter/PKGBUILD
deleted file mode 100644
index 70b6986e3..000000000
--- a/testing/clutter/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 118176 2011-04-05 18:06:09Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=clutter
-pkgver=1.6.14
-pkgrel=1
-pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('gdk-pixbuf2' 'json-glib' 'atk' 'pango' 'mesa' 'libxcomposite' 'libxi')
-makedepends=('gobject-introspection' 'gtk-doc')
-source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('0564e57ca8eb24e76014627c0bb28a80a6c01b620ba14bc4198365562549576d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-introspection
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/cups-pk-helper/PKGBUILD b/testing/cups-pk-helper/PKGBUILD
deleted file mode 100644
index 4f491f860..000000000
--- a/testing/cups-pk-helper/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-#$Id: PKGBUILD 119655 2011-04-13 10:39:02Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=cups-pk-helper
-pkgver=0.1.2
-pkgrel=1
-pkgdesc="A helper that makes system-config-printer use PolicyKit"
-arch=(i686 x86_64 'mips64el')
-url="http://www.freedesktop.org/software/cups-pk-helper/releases/"
-license=('GPL')
-depends=(dbus-glib polkit libcups)
-makedepends=(intltool)
-install=
-source=(http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ccc5f35c5232b83c16929431b352775dd4c63cb92759ec45a525edb6fcb805df')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/cups-pk-helper
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD
deleted file mode 100644
index 2e1f2dd4e..000000000
--- a/testing/curl/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 120474 2011-04-24 01:23:51Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=curl
-pkgver=7.21.6
-pkgrel=1
-pkgdesc="An URL retrival utility and library"
-arch=('i686' 'x86_64')
-url="http://curl.haxx.se"
-license=('MIT')
-depends=('zlib' 'openssl' 'bash' 'ca-certificates')
-options=('!libtool')
-source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2
-        curlbuild.h)
-
-[[ $CARCH == "x86_64" ]] && _curlbuild=curlbuild-64.h
-[[ $CARCH == "i686" ]] && _curlbuild=curlbuild-32.h
-md5sums=('6611989a81ebd7b03a35adc3001ddee0'
-         '751bd433ede935c8fae727377625a8ae')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    ./configure \
-        --with-random=/dev/urandom \
-        --prefix=/usr \
-        --mandir=/usr/share/man \
-        --disable-dependency-tracking \
-        --enable-ipv6 \
-        --disable-ldaps \
-        --disable-ldap \
-        --enable-manual \
-        --enable-versioned-symbols \
-        --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
-        --without-libidn \
-        --enable-threaded-resolver
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    make DESTDIR=${pkgdir} install
-    install -Dm644 COPYING \
-        ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-    install -Dm644 docs/libcurl/libcurl.m4 \
-        ${pkgdir}/usr/share/aclocal/libcurl.m4
-    mv "${pkgdir}/usr/include/curl/curlbuild.h" "${pkgdir}/usr/include/curl/${_curlbuild}"
-    install -m 644 ${srcdir}/curlbuild.h "${pkgdir}/usr/include/curl/curlbuild.h"
-}
diff --git a/testing/curl/curlbuild.h b/testing/curl/curlbuild.h
deleted file mode 100644
index b48862696..000000000
--- a/testing/curl/curlbuild.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-#include "curlbuild-32.h"
-#elif __WORDSIZE == 64
-#include "curlbuild-64.h"
-#else
-#error "Unknown word size"
-#endif
diff --git a/testing/dconf/PKGBUILD b/testing/dconf/PKGBUILD
deleted file mode 100644
index f9bd14a1b..000000000
--- a/testing/dconf/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 118171 2011-04-05 17:33:39Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=dconf
-pkgver=0.7.3
-pkgrel=2
-pkgdesc="A low-level configuration system."
-arch=(i686 x86_64 'mips64el')
-url="http://live.gnome.org/dconf"
-license=('LGPL2.1')
-depends=('glib2')
-makedepends=('vala' 'gobject-introspection' 'gtk3')
-optdepends=('gtk3: for dconf-editor')
-install=dconf.install
-source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2
-       load-enum.patch)
-sha256sums=('84efc95cb62b6637b2131e110ff447908be739c2185d69bebb300293b561dfd9'
-            '8ead56b2897b18c97b9b72b81bd6e9f9249e28743b05a2653bbf4e6af7d9f7cc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/load-enum.patch"
-  ./configure --prefix=/usr \
-    --libexecdir=/usr/lib/dconf
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/dconf/dconf.install b/testing/dconf/dconf.install
deleted file mode 100644
index 5a87df82f..000000000
--- a/testing/dconf/dconf.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gio-querymodules usr/lib/gio/modules
-}
-
-post_upgrade(){
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/dconf/load-enum.patch b/testing/dconf/load-enum.patch
deleted file mode 100644
index 949de1e00..000000000
--- a/testing/dconf/load-enum.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0d00a6ad3385e08eff0c50efe970af8d5d63c536 Mon Sep 17 00:00:00 2001
-From: Robert Ancell <robert.ancell@canonical.com>
-Date: Tue, 29 Mar 2011 05:50:12 +0000
-Subject: editor: Load *.enums.xml as well as *.gschema.xml.  This was stopping some enums from being loaded.
-
-Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=636880
----
-diff --git a/editor/dconf-schema.vala b/editor/dconf-schema.vala
-index 2b34e28..c2654b5 100644
---- a/editor/dconf-schema.vala
-+++ b/editor/dconf-schema.vala
-@@ -371,7 +371,7 @@ public class SchemaList
-         while ((info = i.next_file (null)) != null) {
-             string name = info.get_name();
- 
--            if (!name.has_suffix(".gschema.xml"))
-+            if (!name.has_suffix(".gschema.xml") && !name.has_suffix(".enums.xml"))
-                 continue;
- 
-             string path = Path.build_filename(dir, name, null);
---
-cgit v0.9
diff --git a/testing/devhelp/PKGBUILD b/testing/devhelp/PKGBUILD
deleted file mode 100644
index dd35c9cfe..000000000
--- a/testing/devhelp/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 117678 2011-04-04 16:09:16Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=devhelp
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="API documentation browser for GNOME"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-url="http://live.gnome.org/devhelp/"
-depends=('gconf' 'libwebkit3' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'python2')
-options=('!libtool' '!emptydirs')
-install=devhelp.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('e07094824bb655d8f2c2caa471aa97d2e0d705090d8b269bacc978cdc57e4a8d')
-
-build() {
-  cd "${srcdir}/devhelp-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/devhelp-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain devhelp ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/devhelp/devhelp.install b/testing/devhelp/devhelp.install
deleted file mode 100644
index 4db5f6e5c..000000000
--- a/testing/devhelp/devhelp.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=devhelp
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/ekiga/PKGBUILD b/testing/ekiga/PKGBUILD
deleted file mode 100644
index dbf781e2f..000000000
--- a/testing/ekiga/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 112176 2011-03-04 10:45:51Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-
-pkgname=ekiga
-pkgver=3.3.0
-pkgrel=2
-pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
-url="http://www.ekiga.org"
-license=(GPL)
-arch=(i686 x86_64 'mips64el')
-depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2')
-makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
-optdepends=('evolution-data-server: Evolution integration')
-provides=('gnomemeeting')
-replaces=('gnomemeeting')
-options=(!emptydirs)
-groups=('gnome-extra')
-install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3fb22704e44afebf4294632505fb7a13f3eccb152fcb5878e97aa556d9486d2c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-install \
-      --disable-scrollkeeper --enable-dbus
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ekiga ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/ekiga/ekiga.install b/testing/ekiga/ekiga.install
deleted file mode 100644
index b1d76a4a3..000000000
--- a/testing/ekiga/ekiga.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=ekiga
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD
deleted file mode 100644
index a42ae2bd2..000000000
--- a/testing/empathy/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 120614 2011-04-25 18:12:59Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=empathy
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="A GNOME instant messaging client using the Telepathy framework."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://live.gnome.org/Empathy"
-license=('GPL2')
-depends=('telepathy-glib' 'telepathy-mission-control' 'folks' 'telepathy-logger' 'telepathy-farsight' 'gnome-keyring' 'gnutls' 'evolution-data-server'
-         'libcanberra' 'libnotify' 'enchant' 'iso-codes' 'libwebkit3' 'dconf' 'ca-certificates')
-makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gnome-control-center')
-optdepends=('telepathy-gabble: XMPP/Jabber support'
-            'telepathy-butterfly: MSN support'
-            'telepathy-idle: IRC support'
-            'telepathy-salut: Link-local XMPP support'
-            'telepathy-sofiasip: SIP support'
-            'telepathy-haze: libpurple support')
-options=('!libtool')
-groups=('gnome-extra')
-install=empathy.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4e29feb9f1100db2b4183b6f3aeccca85b0c89e7806c28adff0cb365b55c3809')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-      --sysconfdir=/etc  \
-      --libexecdir=/usr/lib/empathy \
-      --disable-static \
-      --disable-scrollkeeper \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/empathy/empathy.install b/testing/empathy/empathy.install
deleted file mode 100644
index 63dd6b907..000000000
--- a/testing/empathy/empathy.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-    echo "To use Empathy you need to install at least one Telepathy connection manager."
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/eog-plugins/PKGBUILD b/testing/eog-plugins/PKGBUILD
deleted file mode 100644
index 15430e72d..000000000
--- a/testing/eog-plugins/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 120414 2011-04-23 21:13:06Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-pkgname=eog-plugins
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Plugins for Eye of Gnome"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gnome.org/"
-license=('GPL2')
-depends=('eog' 'libpeas' 'libchamplain' 'libexif')
-makedepends=('intltool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('87cced9baf3c8ba84dcad95d774686694f5cb140a187a7bad3891bc50bc4c7bd')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/eog-plugins/eog-plugins.install b/testing/eog-plugins/eog-plugins.install
deleted file mode 100644
index 24072f316..000000000
--- a/testing/eog-plugins/eog-plugins.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/eog/PKGBUILD b/testing/eog/PKGBUILD
deleted file mode 100644
index 44b11b962..000000000
--- a/testing/eog/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 120830 2011-04-26 16:59:37Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=eog
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="Eye of Gnome: An image viewing and cataloging program"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gnome-desktop' 'libexif' 'lcms' 'desktop-file-utils' 'exempi'
-         'dbus-glib' 'libpeas' 'librsvg' 'gnome-icon-theme')
-makedepends=('gtk-doc' 'intltool')
-install=eog.install
-groups=('gnome-extra')
-options=('!emptydirs' '!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('97e40b0e0b618a53dffa83e30ff9add1563d54356e6ab1d588d510cedbc148d2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # remove it from Xfce menu that ships its own thingy
-  echo "NotShowIn=XFCE" >> ${pkgdir}/usr/share/applications/eog.desktop
-}
diff --git a/testing/eog/eog.install b/testing/eog/eog.install
deleted file mode 100644
index 284b24b18..000000000
--- a/testing/eog/eog.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall eog
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/epiphany-extensions/PKGBUILD b/testing/epiphany-extensions/PKGBUILD
deleted file mode 100644
index cb6a21df4..000000000
--- a/testing/epiphany-extensions/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 119191 2011-04-11 08:30:21Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=epiphany-extensions
-pkgver=3.0.0
-pkgrel=1
-url="http://www.gnome.org/projects/epiphany/"
-pkgdesc="Various extentions for the Epiphany web browser"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('epiphany' 'opensp' 'hicolor-icon-theme')
-makedepends=('gnome-doc-utils' 'intltool')
-options=('!libtool' '!emptydirs')
-install=epiphany-extensions.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c9984de0912b307fecd0232135c0e3d8c7f0859867b9693221ff12d1c483b724')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/epiphany-extensions/epiphany-extensions.install b/testing/epiphany-extensions/epiphany-extensions.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/testing/epiphany-extensions/epiphany-extensions.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/epiphany/PKGBUILD b/testing/epiphany/PKGBUILD
deleted file mode 100644
index 60e8de91a..000000000
--- a/testing/epiphany/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 117992 2011-04-05 06:37:18Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=epiphany
-pkgver=3.0.0
-pkgrel=1
-install=epiphany.install
-pkgdesc="A GNOME3 web browser based on the WebKit rendering engine."
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libsoup-gnome' 'gsettings-desktop-schemas' 'libwebkit3' 'nss'
-         'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
-         'hicolor-icon-theme')
-makedepends=('intltool' 'networkmanager' 'gnome-doc-utils' 'startup-notification')
-options=('!libtool' '!emptydirs')
-groups=('gnome')
-url="http://www.gnome.org/projects/epiphany/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9407220e21e95008b0c5b0a0383d1bdc56a932c40a4486ea4f996ba47eeae7bb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-scrollkeeper \
-      --enable-network-manager
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/epiphany/epiphany.install b/testing/epiphany/epiphany.install
deleted file mode 100644
index 00b1abb96..000000000
--- a/testing/epiphany/epiphany.install
+++ /dev/null
@@ -1,20 +0,0 @@
-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
-}
-
-pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/epiphany.schemas ]; then
-    usr/sbin/gconfpkg --uninstall epiphany
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/evince/PKGBUILD b/testing/evince/PKGBUILD
deleted file mode 100644
index c956aab16..000000000
--- a/testing/evince/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 119825 2011-04-15 13:37:39Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evince
-pkgver=3.0.0
-pkgrel=2
-pkgdesc="Simply a document viewer"
-url="http://projects.gnome.org/evince/"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme'
-         't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
-makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection')
-optdepends=('texlive-bin: DVI support')
-groups=('gnome-extra')
-install=evince.install
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7c994a94200114ea7077d3348a03cbbad01c819ece2ec24b436b16e04386291b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr   --sysconfdir=/etc \
-      --localstatedir=/var    --libexecdir=/usr/lib/evince \
-      --disable-static        --enable-nautilus \
-      --enable-pdf            --enable-tiff \
-      --enable-djvu           --enable-dvi \
-      --enable-t1lib          --enable-comics \
-      --disable-scrollkeeper  --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/evince/evince.install b/testing/evince/evince.install
deleted file mode 100644
index 9643a9ba0..000000000
--- a/testing/evince/evince.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall evince
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/evolution-data-server/PKGBUILD b/testing/evolution-data-server/PKGBUILD
deleted file mode 100644
index 756a4e379..000000000
--- a/testing/evolution-data-server/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 120574 2011-04-25 17:24:21Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-data-server
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop"
-arch=('i686' 'x86_64' 'mips64el')
-depends=('libsoup' 'nss' 'libgnome-keyring' 'heimdal' 'libgweather' 'libical' 'db' 'libgdata')
-makedepends=('intltool' 'gperf' 'gobject-introspection')
-options=('!libtool')
-url="http://www.gnome.org"
-license=('GPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8592be94027a9848ac18670a0e86e48e857539cd2813eb345eda0ace19688dd0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --with-openldap=yes \
-      --libexecdir=/usr/lib/evolution-data-server \
-      --with-krb5=/usr --with-libdb=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/evolution-exchange/PKGBUILD b/testing/evolution-exchange/PKGBUILD
deleted file mode 100644
index 7d90c1ee1..000000000
--- a/testing/evolution-exchange/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 120624 2011-04-25 18:31:36Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-exchange
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="Ximian Connector Exchange plugin for Evolution"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.ximian.com"
-depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop' 'libunique3')
-makedepends=('intltool' 'evolution')
-options=('!libtool' '!emptydirs')
-install=evolution-exchange.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4c020f7946f534e3245806f29f48dbc9ccb98afdbc92d7bb5b14a5410668ad02')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/evolution --disable-static \
-      --with-libdb=/usr --with-krb5=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-exchange-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/evolution-exchange/evolution-exchange.install b/testing/evolution-exchange/evolution-exchange.install
deleted file mode 100644
index 1179887f9..000000000
--- a/testing/evolution-exchange/evolution-exchange.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=evolution-exchange
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/evolution/PKGBUILD b/testing/evolution/PKGBUILD
deleted file mode 100644
index 42e98b3ca..000000000
--- a/testing/evolution/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 120599 2011-04-25 17:55:43Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="Integrated Workgroup and Personal Information Management for Gnome"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'libsm' 'gstreamer0.10' 'libunique3' 'libnotify' 'libpst' 'libytnef'
-         'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils' 'networkmanager')
-optdepends=('bogofilter: possible junk filter plugin'
-            'spamassassin: possible junk filter plugin')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-install=evolution.install
-url=http://www.gnome.org/projects/evolution/
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d322241c38ece00e2ee7adf0c4d0583dc811c52d5a176ef93427b9b35c04487b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib \
-      --disable-scrollkeeper \
-      --enable-nss=yes \
-      --with-openldap=yes \
-      --enable-smime=yes \
-      --with-krb5=/usr \
-      --disable-image-inline
-  make
-  make -C plugins/tnef-attachments
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  make -C plugins/tnef-attachments DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/evolution/evolution.install b/testing/evolution/evolution.install
deleted file mode 100644
index a2c3aaa54..000000000
--- a/testing/evolution/evolution.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=evolution
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/farsight2/PKGBUILD b/testing/farsight2/PKGBUILD
deleted file mode 100644
index 32004706a..000000000
--- a/testing/farsight2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 111877 2011-03-01 15:02:05Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: William Díaz <wdiaz@archlinux.us>
-
-pkgname=farsight2
-pkgver=0.0.26
-pkgrel=1
-pkgdesc="Audio/Video conference software for Instant Messengers"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://farsight.freedesktop.org"
-license=('LGPL')
-depends=('libnice' 'gstreamer0.10-base-plugins' 'gstreamer0.10-python' 'python2' 'pygobject')
-optdepends=('gstreamer0.10-good-plugins: for RTP plugin'
-            'gstreamer0.10-bad-plugins: for RTP plugin')
-options=('!libtool' '!emptydirs')
-source=(http://farsight.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('7756d910687dd2abd455fd68e83f125c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's#python-config#python2-config#' python/Makefile.in
-  ./configure --prefix=/usr \
-      --with-package-name='Arch Linux farsight2 package' \
-      --with-package-origin='http://archlinux.org' \
-      --disable-static \
-      --disable-valgrind \
-      --disable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/file-roller/PKGBUILD b/testing/file-roller/PKGBUILD
deleted file mode 100644
index d340971a2..000000000
--- a/testing/file-roller/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 120737 2011-04-26 09:07:12Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=file-roller
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="Archive manipulator for GNOME2"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'libsm')
-optdepends=('nautilus: nautilus shell extension'
-            'unrar: the RAR uncompression program'
-            'zip: creates PKZIP-compatible .zip files'
-            'unzip: unpacks .zip archives'
-            'p7zip: 7zip compression utility'
-            'xz: managing LZMA and XZ compressed files'
-            'arj: ARJ archiver'
-            'unace: extraction tool for the proprietary ace archive format')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-install=file-roller.install
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('805f5fb77fa8c2f982a2cee0db1b56fbc335f63a1eed34e0bac228ce8349d3ce')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/file-roller \
-      --localstatedir=/var --disable-static \
-      --disable-scrollkeeper --disable-schemas-compile
-  make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/file-roller/file-roller.install b/testing/file-roller/file-roller.install
deleted file mode 100644
index 10a148241..000000000
--- a/testing/file-roller/file-roller.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=file-roller
-
-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
-}
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        usr/sbin/gconfpkg --uninstall ${pkgname}
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/folks/PKGBUILD b/testing/folks/PKGBUILD
deleted file mode 100644
index 81036be00..000000000
--- a/testing/folks/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 120851 2011-04-26 21:20:48Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=folks
-pkgver=0.4.3
-pkgrel=1
-pkgdesc="Library to aggregates people into metacontacts "
-arch=(i686 x86_64 'mips64el')
-url="http://telepathy.freedesktop.org/wiki/Folks"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libgee' 'libxml2')
-makedepends=('gobject-introspection' 'vala' 'intltool')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('e5a5bbe1524130ff5b6400726db3e12299b12ffefa108bc89169509f343d925e')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gcalctool/PKGBUILD b/testing/gcalctool/PKGBUILD
deleted file mode 100644
index c397966ce..000000000
--- a/testing/gcalctool/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 120856 2011-04-26 21:28:12Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gcalctool
-pkgver=6.0.1
-pkgrel=1
-pkgdesc="GNOME Scientific calculator"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gtk3' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils')
-groups=('gnome-extra')
-options=(!emptydirs)
-url="http://www.gnome.org"
-install=gcalctool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('be11a7c36a1ec20bd0b190e572aefedea13fb2cb8479b06673e182c7461cadfe')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gcalctool/gcalctool.install b/testing/gcalctool/gcalctool.install
deleted file mode 100644
index 2ef26aaa9..000000000
--- a/testing/gcalctool/gcalctool.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/gconf-editor/PKGBUILD b/testing/gconf-editor/PKGBUILD
deleted file mode 100644
index d47432967..000000000
--- a/testing/gconf-editor/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 117817 2011-04-04 18:08:43Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gconf-editor
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Graphical gconf registry editor"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('gconf' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils')
-url="http://www.gnome.org"
-groups=('gnome-extra')
-options=(!emptydirs)
-install=gconf-editor.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('184e17416c2dd927ccb3a9b435d86fbe4b654316b91a6db724a3fd447a9fae60')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-     --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gconf-editor ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gconf-editor/gconf-editor.install b/testing/gconf-editor/gconf-editor.install
deleted file mode 100644
index 307eaa047..000000000
--- a/testing/gconf-editor/gconf-editor.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gconf-editor
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gconf/01_xml-gettext-domain.patch b/testing/gconf/01_xml-gettext-domain.patch
deleted file mode 100644
index d1323f61f..000000000
--- a/testing/gconf/01_xml-gettext-domain.patch
+++ /dev/null
@@ -1,362 +0,0 @@
-# Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks.
-# Ubuntu: https://bugs.launchpad.net/bugs/123025
-# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845
---- GConf-2.26.0/backends/markup-tree.c.gettext	2009-04-26 23:33:05.258484987 -0400
-+++ GConf-2.26.0/backends/markup-tree.c	2009-04-26 23:34:25.026700526 -0400
-@@ -52,6 +52,7 @@ struct _MarkupEntry
-   char       *schema_name;
-   char       *mod_user;
-   GTime       mod_time;
-+  const char *gettext_domain;
- };
- 
- static LocalSchemaInfo* local_schema_info_new  (void);
-@@ -1593,6 +1594,8 @@ markup_entry_set_value (MarkupEntry     
-                              gconf_schema_get_type (schema));
-       gconf_schema_set_owner (current_schema,
-                               gconf_schema_get_owner (schema));
-+      gconf_schema_set_gettext_domain (current_schema,
-+                              gconf_schema_get_gettext_domain (schema));
-     }
- 
-   /* Update mod time */
-@@ -1805,6 +1808,8 @@ markup_entry_get_value (MarkupEntry *ent
-       else if (c_local_schema && c_local_schema->long_desc)
-         gconf_schema_set_long_desc (schema, c_local_schema->long_desc);
- 
-+      gconf_schema_set_gettext_domain (schema, entry->gettext_domain);
-+
-       return retval;
-     }
- }
-@@ -2339,8 +2344,9 @@ parse_value_element (GMarkupParseContext
-   const char *ltype;
-   const char *list_type;
-   const char *owner;
-+
-   GConfValueType vtype;
--  const char *dummy1, *dummy2, *dummy3, *dummy4;
-+  const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5;
-   
- #if 0
-   g_assert (ELEMENT_IS ("entry") ||
-@@ -2377,6 +2383,7 @@ parse_value_element (GMarkupParseContext
-                           "muser", &dummy2,
-                           "mtime", &dummy3,
-                           "schema", &dummy4,
-+                          "gettext_domain", &dummy5,
- 
-                           NULL))
-     return;
-@@ -2683,6 +2690,7 @@ parse_entry_element (GMarkupParseContext
-       const char *mtime;
-       const char *schema;
-       const char *type;
-+      const char *gettext_domain;
-       const char *dummy1, *dummy2, *dummy3, *dummy4;
-       const char *dummy5, *dummy6, *dummy7;
-       GConfValue *value;
-@@ -2693,6 +2701,7 @@ parse_entry_element (GMarkupParseContext
-       mtime = NULL;
-       schema = NULL;
-       type = NULL;
-+      gettext_domain = NULL;
- 
-       if (!locate_attributes (context, element_name, attribute_names, attribute_values,
-                               error,
-@@ -2701,6 +2710,7 @@ parse_entry_element (GMarkupParseContext
-                               "mtime", &mtime,
-                               "schema", &schema,
-                               "type", &type,
-+                              "gettext_domain", &gettext_domain,
-                           
-                               /* These are allowed but we don't use them until
-                                * parse_value_element
-@@ -2768,6 +2778,9 @@ parse_entry_element (GMarkupParseContext
-        */
-       if (schema)
-         entry->schema_name = g_strdup (schema);
-+
-+      if (gettext_domain)
-+        entry->gettext_domain = g_intern_string (gettext_domain);
-     }
-   else
-     {
-@@ -3716,6 +3729,7 @@ write_value_element (GConfValue *value,
-         GConfSchema *schema;
-         GConfValueType stype;
-         const char *owner;
-+        const char *gettext_domain;
-         
-         schema = gconf_value_get_schema (value);
- 
-@@ -3741,6 +3755,23 @@ write_value_element (GConfValue *value,
-             
-             g_free (s);
-           }
-+
-+        gettext_domain = gconf_schema_get_gettext_domain (schema);
-+        
-+        if (gettext_domain)
-+          {
-+            char *s;
-+
-+            s = g_markup_escape_text (gettext_domain, -1);
-+            
-+            if (fprintf (f, " gettext_domain=\"%s\"", s) < 0)
-+              {
-+                g_free (s);
-+                return FALSE;
-+              }
-+            
-+            g_free (s);
-+          }
-         
-         if (stype == GCONF_VALUE_LIST)
-           {
-diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd
---- GConf-2.26.0/doc/gconf-1.0.dtd.gettext	2009-04-26 23:33:17.240736103 -0400
-+++ GConf-2.26.0/doc/gconf-1.0.dtd	2009-04-26 23:34:25.027700384 -0400
-@@ -7,7 +7,7 @@
- <!-- A single schema. What I am trying to say is "this set of
- elements, in any order". Duplicate elements (apart from <locale>) are
- not allowed). -->
--<!ELEMENT schema  (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*)*>
-+<!ELEMENT schema  (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*|gettext_domain?)*>
- 
- <!-- The key for this schema (e.g. /schemas/apps/foo/bar) -->
- <!ELEMENT key     (#PCDATA)>
-diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c
---- GConf-2.26.0/gconf/gconf-internals.c.gettext	2009-04-26 23:34:10.994700035 -0400
-+++ GConf-2.26.0/gconf/gconf-internals.c	2009-04-26 23:34:53.767450191 -0400
-@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem
-   cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : "");
-   cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : "");
-   cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : "");
-+  cs->gettext_domain = CORBA_string_dup (gconf_schema_get_gettext_domain (sc) ? gconf_schema_get_gettext_domain (sc) : "");
- 
-   {
-     gchar* encoded;
-@@ -600,6 +601,14 @@ gconf_schema_from_corba_schema(const Con
-         gconf_schema_set_owner(sc, cs->owner);
-     }
-       
-+  if (*cs->gettext_domain != '\0')
-+    {
-+      if (!g_utf8_validate (cs->gettext_domain, -1, NULL))
-+        gconf_log (GCL_ERR, _("Invalid UTF-8 in gettext domain for schema"));
-+      else
-+        gconf_schema_set_gettext_domain(sc, cs->gettext_domain);
-+    }
-+      
-   {
-     GConfValue* val;
- 
-diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c
---- GConf-2.26.0/gconf/gconf-schema.c.gettext	2009-04-26 23:33:26.787483545 -0400
-+++ GConf-2.26.0/gconf/gconf-schema.c	2009-04-26 23:35:54.240450142 -0400
-@@ -32,9 +32,10 @@ typedef struct {
-   GConfValueType car_type; /* Pair car type of the described entry */
-   GConfValueType cdr_type; /* Pair cdr type of the described entry */
-   gchar* locale;       /* Schema locale */
--  gchar* owner;        /* Name of creating application */
-+  const gchar* owner;        /* Name of creating application */
-   gchar* short_desc;   /* 40 char or less description, no newlines */
-   gchar* long_desc;    /* could be a paragraph or so */
-+  const gchar* gettext_domain; /* description gettext domain */
-   GConfValue* default_value; /* Default value of the key */
- } GConfRealSchema;
- 
-@@ -63,7 +64,6 @@ gconf_schema_free (GConfSchema* sc)
-   g_free (real->locale);
-   g_free (real->short_desc);
-   g_free (real->long_desc);
--  g_free (real->owner);
- 
-   if (real->default_value)
-     gconf_value_free (real->default_value);
-@@ -91,7 +91,9 @@ gconf_schema_copy (const GConfSchema* sc
- 
-   dest->long_desc = g_strdup (real->long_desc);
- 
--  dest->owner = g_strdup (real->owner);
-+  dest->gettext_domain = real->gettext_domain;
-+
-+  dest->owner = real->owner;
- 
-   dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL;
-   
-@@ -136,6 +138,17 @@ gconf_schema_set_locale (GConfSchema* sc
-     REAL_SCHEMA (sc)->locale = NULL;
- }
- 
-+void
-+gconf_schema_set_gettext_domain (GConfSchema* sc, const gchar* domain)
-+{
-+  g_return_if_fail (domain == NULL || g_utf8_validate (domain, -1, NULL));
-+  
-+  if (domain)
-+    REAL_SCHEMA (sc)->gettext_domain = g_intern_string (domain);
-+  else 
-+    REAL_SCHEMA (sc)->gettext_domain = NULL;
-+}
-+
- void          
- gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc)
- {
-@@ -169,11 +182,8 @@ gconf_schema_set_owner (GConfSchema* sc,
- {
-   g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL));
-   
--  if (REAL_SCHEMA (sc)->owner)
--    g_free (REAL_SCHEMA (sc)->owner);
--
-   if (owner)
--    REAL_SCHEMA (sc)->owner = g_strdup (owner);
-+    REAL_SCHEMA (sc)->owner = g_intern_string (owner);
-   else
-     REAL_SCHEMA (sc)->owner = NULL;
- }
-@@ -228,6 +238,14 @@ gconf_schema_validate (const GConfSchema
-       return FALSE;
-     }
- 
-+  if (real->gettext_domain && !g_utf8_validate (real->gettext_domain, -1, NULL))
-+    {
-+      g_set_error (err, GCONF_ERROR,
-+                   GCONF_ERROR_FAILED,
-+                   _("Schema contains invalid UTF-8"));
-+      return FALSE;
-+    }
-+
-   if (real->owner && !g_utf8_validate (real->owner, -1, NULL))
-     {
-       g_set_error (err, GCONF_ERROR,
-@@ -299,11 +317,32 @@ gconf_schema_get_locale (const GConfSche
- }
- 
- const char*
-+gconf_schema_get_gettext_domain (const GConfSchema *schema)
-+{
-+  g_return_val_if_fail (schema != NULL, NULL);
-+
-+  return REAL_SCHEMA (schema)->gettext_domain;
-+}
-+
-+static inline const char *
-+schema_translate (const GConfSchema *schema,
-+                  const char        *string)
-+{
-+  if (REAL_SCHEMA (schema)->gettext_domain)
-+    {
-+      bind_textdomain_codeset (REAL_SCHEMA (schema)->gettext_domain, "UTF-8");
-+      return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, string);
-+    }
-+  else
-+    return string;
-+}
-+
-+const char*
- gconf_schema_get_short_desc (const GConfSchema *schema)
- {
-   g_return_val_if_fail (schema != NULL, NULL);
- 
--  return REAL_SCHEMA (schema)->short_desc;
-+ return schema_translate (schema, REAL_SCHEMA (schema)->short_desc);
- }
- 
- const char*
-@@ -311,7 +350,7 @@ gconf_schema_get_long_desc (const GConfS
- {
-   g_return_val_if_fail (schema != NULL, NULL);
- 
--  return REAL_SCHEMA (schema)->long_desc;
-+ return schema_translate (schema, REAL_SCHEMA (schema)->long_desc);
- }
- 
- const char*
-diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h
---- GConf-2.26.0/gconf/gconf-schema.h.gettext	2009-04-26 23:33:33.979744088 -0400
-+++ GConf-2.26.0/gconf/gconf-schema.h	2009-04-26 23:34:25.030737043 -0400
-@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type          
-                                             GConfValueType  type);
- void gconf_schema_set_locale               (GConfSchema    *sc,
-                                             const gchar    *locale);
-+void gconf_schema_set_gettext_domain       (GConfSchema    *sc,
-+                                            const gchar    *domain);
- void gconf_schema_set_short_desc           (GConfSchema    *sc,
-                                             const gchar    *desc);
- void gconf_schema_set_long_desc            (GConfSchema    *sc,
-@@ -65,6 +67,7 @@ GConfValueType gconf_schema_get_list_typ
- GConfValueType gconf_schema_get_car_type      (const GConfSchema *schema);
- GConfValueType gconf_schema_get_cdr_type      (const GConfSchema *schema);
- const char*    gconf_schema_get_locale        (const GConfSchema *schema);
-+const char*    gconf_schema_get_gettext_domain(const GConfSchema *schema);
- const char*    gconf_schema_get_short_desc    (const GConfSchema *schema);
- const char*    gconf_schema_get_long_desc     (const GConfSchema *schema);
- const char*    gconf_schema_get_owner         (const GConfSchema *schema);
-diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c
---- GConf-2.26.0/gconf/gconftool.c.gettext	2009-04-26 23:33:41.907451190 -0400
-+++ GConf-2.26.0/gconf/gconftool.c	2009-04-26 23:34:25.034736752 -0400
-@@ -3295,6 +3295,7 @@ struct _SchemaInfo {
-   GConfValueType cdr_type;
-   GConfValue* global_default;
-   GHashTable* hash;
-+  gchar* gettext_domain;
- };
- 
- static int
-@@ -3547,6 +3548,15 @@ extract_global_info(xmlNodePtr node,
-               else
-                 g_printerr (_("WARNING: empty <applyto> node"));
-             }
-+          else if (strcmp((char *)iter->name, "gettext_domain") == 0)
-+            {
-+              tmp = (char *)xmlNodeGetContent(iter);
-+              if (tmp)
-+                {
-+                  info->gettext_domain = g_strdup(tmp);
-+                  xmlFree(tmp);
-+                }
-+            }
-           else
-             g_printerr (_("WARNING: node <%s> not understood below <schema>\n"),
- 			iter->name);
-@@ -3636,6 +3646,9 @@ process_locale_info(xmlNodePtr node, Sch
-   if (info->owner != NULL)
-     gconf_schema_set_owner(schema, info->owner);
- 
-+  if (info->gettext_domain != NULL)
-+    gconf_schema_set_gettext_domain(schema, info->gettext_domain);
-+
-   xmlFree(name);
- 
-   /* Locale-specific info */
-@@ -3765,6 +3778,7 @@ get_schema_from_xml(xmlNodePtr node, gch
-   info.apply_to = NULL;
-   info.owner = NULL;
-   info.global_default = NULL;
-+  info.gettext_domain = NULL;
-   info.hash = g_hash_table_new(g_str_hash, g_str_equal);
-   
-   extract_global_info(node, &info);
-@@ -3801,6 +3815,8 @@ get_schema_from_xml(xmlNodePtr node, gch
-             ;  /* nothing */
-           else if (strcmp((char *)iter->name, "applyto") == 0)
-             ;  /* nothing */
-+          else if (strcmp((char *)iter->name, "gettext_domain") == 0)
-+            ;  /* nothing */
-           else if (strcmp((char *)iter->name, "locale") == 0)
-             {
-               process_locale_info(iter, &info);
-diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl
---- GConf-2.26.0/gconf/GConfX.idl.gettext	2009-04-26 23:33:58.457483190 -0400
-+++ GConf-2.26.0/gconf/GConfX.idl	2009-04-26 23:34:53.764448732 -0400
-@@ -16,6 +16,7 @@ struct ConfigSchema {
-   string short_desc;
-   string long_desc;
-   string owner;
-+  string gettext_domain;
-   // Work around lack of recursive data types
-   string encoded_default_value;
- };
diff --git a/testing/gconf/PKGBUILD b/testing/gconf/PKGBUILD
deleted file mode 100644
index 6aa7c7c4f..000000000
--- a/testing/gconf/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 120561 2011-04-25 17:06:15Z ibiru $
-# Maintainer:  Jan de Groot <jan@archlinux.org>
-
-pkgname=gconf
-pkgver=2.32.3
-pkgrel=1
-pkgdesc="A configuration database system"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL')
-depends=('orbit2' 'libxml2' 'polkit' 'libldap' 'dbus-glib' 'gtk3')
-makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection')
-options=('!libtool')
-install=gconf.install
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.32/GConf-${pkgver}.tar.bz2
-        gconf-merge-schema
-        gconfpkg
-        gconf-reload.patch
-        01_xml-gettext-domain.patch)
-sha256sums=('63e249d16b1b50820e9c32f1d85ff2c94498afdd45544fa5f37b8e1d084c5bae'
-            'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028'
-            'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898'
-            '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
-            'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8')
-
-build() {
-  cd "${srcdir}/GConf-${pkgver}"
-  # Patch from fedora - reloads gconf after installing schemas
-  patch -Np1 -i "${srcdir}/gconf-reload.patch"
-  # http://bugzilla.gnome.org/show_bug.cgi?id=568845
-  patch -Np1 -i "${srcdir}/01_xml-gettext-domain.patch"
-
-  # Python2 fix
-  sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/GConf \
-      --disable-static --enable-defaults-service --with-gtk=3.0
-
-  make pkglibdir=/usr/lib/GConf
-}
-
-package() {
-  cd "${srcdir}/GConf-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/gconf/gconf.xml.system"
-  install -m755 "${srcdir}/gconf-merge-schema" "${pkgdir}/usr/bin/"
-  install -Dm755 "${srcdir}/gconfpkg" "${pkgdir}/usr/sbin/gconfpkg"
-}
diff --git a/testing/gconf/gconf-merge-schema b/testing/gconf/gconf-merge-schema
deleted file mode 100755
index 992c162e6..000000000
--- a/testing/gconf/gconf-merge-schema
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-if [ ! "$1" -a ! "$2" ]; then
-  echo "Usage: $0 output.schemas [--domain gettextdomain] file1.schemas [file2.schemas [...]]"
-  exit 1
-fi
-
-OUTFILE="$1"
-DOMAIN=""
-shift
-
-if [ "$1" = "--domain" ]; then
-  shift
-  DOMAIN=$1
-  shift
-fi
-
-echo '<?xml version="1.0"?>' > "$OUTFILE"
-echo '<gconfschemafile><schemalist>' >> "$OUTFILE"
-
-while [ "$1" ]; do
-  if [ -f "$1" ]; then
-    sed -e '/<?xml/d' \
-        -e 's|<gconfschemafile>||g' \
-	-e 's|</gconfschemafile>||g' \
-        -e 's|<schemalist>||g' \
-	-e 's|</schemalist>||g' "$1" >> "$OUTFILE"
-  fi
-  shift
-done
-  
-echo '</schemalist></gconfschemafile>' >> "$OUTFILE"
-if [ "$DOMAIN" != "" ]; then
-  sed -ri "s/^([[:space:]]*)(<locale name=\"C\">)/\1<gettext_domain>$DOMAIN<\/gettext_domain>\n\1\2/; /^[[:space:]]*<locale name=\"[^C]/,/^[[:space:]]*<\/locale>[[:space:]]*\$/ d; /^$/d; s/<\/schema>$/&\n/" "$OUTFILE"
-fi
diff --git a/testing/gconf/gconf-reload.patch b/testing/gconf/gconf-reload.patch
deleted file mode 100644
index 910f0dae4..000000000
--- a/testing/gconf/gconf-reload.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- GConf-2.16.0/gconf/gconftool.c.orig	2006-10-14 17:37:14.000000000 +0000
-+++ GConf-2.16.0/gconf/gconftool.c	2006-10-14 17:39:27.000000000 +0000
-@@ -963,6 +963,8 @@ main (int argc, char** argv)
-       
-       gconf_engine_unref (conf);
- 
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
-+
-       return retval;
-     }
- 
-@@ -975,6 +977,8 @@ main (int argc, char** argv)
-       
-       gconf_engine_unref (conf);
- 
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
-+
-       return retval;
-     }
- 
diff --git a/testing/gconf/gconf.install b/testing/gconf/gconf.install
deleted file mode 100644
index f7945d165..000000000
--- a/testing/gconf/gconf.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  ldconfig -r .
-  chmod 755 etc/gconf/gconf.xml.system
-  usr/bin/gio-querymodules usr/lib/gio/modules
-}
-
-post_upgrade() {
-  ldconfig -r .
-  chmod 755 etc/gconf/gconf.xml.system
-  usr/bin/gio-querymodules usr/lib/gio/modules
-
-  PID=`pidof gconfd-2`
-  if [ ! -z "${PID}" ]; then
-    kill ${PID}
-  fi
-}
-
-post_remove() {
-    usr/bin/gio-querymodules usr/lib/gio/modules
-}
diff --git a/testing/gconf/gconfpkg b/testing/gconf/gconfpkg
deleted file mode 100755
index 72021e45e..000000000
--- a/testing/gconf/gconfpkg
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-usage() {
-cat << _EOF
-Usage:
-  gconfpkg [OPTION] [PACKAGE] 
-
-  Help Options:
-    -?, --help            Show help options
-
-  Application Options:
-    --install             Install schemas for a given package
-    --uninstall           Uninstall schemas for a given package
-
-_EOF
-}
-
-install() {
-  GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-      /usr/bin/gconftool-2 --makefile-install-rule /usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
-}
-
-uninstall() {
-  if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=/usr/share/gconf/schemas/${pkgname}.schemas
-  elif [ -f /opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=/opt/gnome/share/gconf/schemas/${pkgname}.schemas
-  else
-    schemas=`pacman -Ql ${pkgname} | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`
-  fi
-  GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-      /usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas} >/dev/null
-}
-
-if [ -z "$2" ]; then
-  usage
-else
-  pkgname="$2"
-  case "$1" in
-    --install)
-      install
-    ;;
-    --uninstall)
-      uninstall
-    ;;
-    *)
-    usage
-    ;;
-  esac
-fi
diff --git a/testing/gdk-pixbuf2/PKGBUILD b/testing/gdk-pixbuf2/PKGBUILD
deleted file mode 100644
index 11ab4b9d2..000000000
--- a/testing/gdk-pixbuf2/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 117317 2011-03-31 00:18:19Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=gdk-pixbuf2
-pkgver=2.23.3
-pkgrel=1
-pkgdesc="An image loading library for gtk2"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2>=2.28.1' 'libpng' 'libtiff' 'libjpeg' 'libx11')
-makedepends=('gtk-doc' 'gobject-introspection')
-options=('!libtool')
-install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/2.23/gdk-pixbuf-${pkgver}.tar.bz2)
-sha256sums=('9faba780151c02e13cb2029d512c975e9c41b98cd72de6d2cc50e4af10a5e76a')
-
-build() {
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
-
-  ./configure --prefix=/usr \
-    --without-libjasper \
-    --with-included-loaders=png
-  make
-}
-
-package() {
-  cd "${srcdir}/gdk-pixbuf-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gdk-pixbuf2/gdk-pixbuf2.install b/testing/gdk-pixbuf2/gdk-pixbuf2.install
deleted file mode 100644
index 1b35942cb..000000000
--- a/testing/gdk-pixbuf2/gdk-pixbuf2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gdk-pixbuf-query-loaders --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
-}
diff --git a/testing/gdl/PKGBUILD b/testing/gdl/PKGBUILD
deleted file mode 100644
index 6b369dbeb..000000000
--- a/testing/gdl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 120644 2011-04-25 20:32:25Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gdl
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="GNOME Docking Library"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-url="http://www.gnome.org/"
-depends=('gtk3')
-makedepends=('pkgconfig' 'intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('e0c3d855c7f8b115ec10f34db1291cb09db48a24281c3f9242d8348b189d5b09')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gdm/2.91_fix_external_program_directories.patch b/testing/gdm/2.91_fix_external_program_directories.patch
deleted file mode 100644
index 912b5cdae..000000000
--- a/testing/gdm/2.91_fix_external_program_directories.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nur gdm-2.91.91.orig/daemon/gdm-server.c gdm-2.91.91/daemon/gdm-server.c
---- gdm-2.91.91.orig/daemon/gdm-server.c	2011-02-17 19:27:53.000000000 -0800
-+++ gdm-2.91.91/daemon/gdm-server.c	2011-02-27 16:56:51.283347074 -0800
-@@ -131,7 +131,7 @@
-         g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
- 
-         error = NULL;
--        command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
-+        command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s",
-                                    server->priv->display_name);
- 
-         g_debug ("GdmServer: Running helper %s", command);
-diff -Nur gdm-2.91.91.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.91.91/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
---- gdm-2.91.91.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2011-02-17 19:27:53.000000000 -0800
-+++ gdm-2.91.91/data/greeter-autostart/gnome-settings-daemon.desktop.in.in	2011-02-26 08:43:28.700009251 -0800
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Type=Application
- _Name=GNOME Settings Daemon
--TryExec=@LIBEXECDIR@/gnome-settings-daemon
--Exec=@LIBEXECDIR@/gnome-settings-daemon
-+TryExec=/usr/bin/gnome-settings-daemon
-+Exec=/usr/bin/gnome-settings-daemon
- OnlyShowIn=GNOME;
- X-GNOME-Autostart-Phase=Initialization
- X-GNOME-Autostart-Notify=true
-diff -Nur gdm-2.91.91.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in gdm-2.91.91/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
---- gdm-2.91.91.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2011-02-17 19:27:53.000000000 -0800
-+++ gdm-2.91.91/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in	2011-02-26 08:44:06.810009153 -0800
-@@ -1,5 +1,5 @@
- [Desktop Entry]
- Type=Application
- _Name=PolicyKit Authentication Agent
--Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1
-+Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
- OnlyShowIn=GNOME;
-diff -Nur gdm-2.91.91.orig/gui/simple-chooser/gdm-chooser-session.c gdm-2.91.91/gui/simple-chooser/gdm-chooser-session.c
---- gdm-2.91.91.orig/gui/simple-chooser/gdm-chooser-session.c	2011-02-17 19:27:53.000000000 -0800
-+++ gdm-2.91.91/gui/simple-chooser/gdm-chooser-session.c	2011-02-26 08:45:01.946675918 -0800
-@@ -131,7 +131,7 @@
-         ret = FALSE;
- 
-         error = NULL;
--        g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error);
-+        g_spawn_command_line_async ("/usr/bin/gnome-settings-daemon", &error);
-         if (error != NULL) {
-                 g_warning ("Error starting settings daemon: %s", error->message);
-                 g_error_free (error);
diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD
deleted file mode 100644
index bbb3b7622..000000000
--- a/testing/gdm/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 119944 2011-04-17 09:10:01Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=gdm
-pkgver=3.0.0
-pkgrel=3
-pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.gnome.org"
-backup=('etc/pam.d/gdm' 'etc/pam.d/gdm-autologin' 'etc/gdm/custom.conf')
-groups=('gnome-extra')
-options=('!libtool')
-depends=('libcanberra' 'libxklavier' 'tcp_wrappers' 'gnome-session' 'upower' 'accountsservice' 'consolekit')
-makedepends=('intltool' 'gnome-doc-utils' 'xorg-server')
-conflicts=('fast-user-switch-applet')
-replaces=('fast-user-switch-applet')
-install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        2.91_fix_external_program_directories.patch
-        gdm-vt-allocation-hack.patch
-        gdm.pam
-        gdm-autologin.pam
-        gdm
-        fix_crasher_with_gtk307.patch)
-sha256sums=('2d6443912272c0aa339a06b58d797cc11ce6b0854dadfcc027408f546da7aeff'
-            '92c5eb913b9556cffe9b5bb89e5c3435703e929addfb98145442f58af5d532c1'
-            '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
-            'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
-            '3daff680ff6b7ea56f84f40843e46e72477c81e9e405028203c942af04d07ae5'
-            '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
-            '6d08951919dcb1f928dd67c0b5a5c209b32464c2374ee7d2369ed8e914d541c9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/2.91_fix_external_program_directories.patch"
-  patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch"
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=646498
-  patch -Np1 -i "${srcdir}/fix_crasher_with_gtk307.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gdm --localstatedir=/var --disable-static \
-      --with-at-spi-registryd-directory=/usr/lib/at-spi \
-      --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gdm ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -r "${pkgdir}/etc/gconf/schemas/"
-
-  install -m644 "${srcdir}/gdm.pam" "${pkgdir}/etc/pam.d/gdm"
-  install -m644 "${srcdir}/gdm-autologin.pam" "${pkgdir}/etc/pam.d/gdm-autologin"
-
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/"
-
-  rmdir "${pkgdir}/var/gdm"
-  chmod 1770 "${pkgdir}/var/log/gdm"
-  rm -rf "${pkgdir}/var/run"
-}
diff --git a/testing/gdm/fix_crasher_with_gtk307.patch b/testing/gdm/fix_crasher_with_gtk307.patch
deleted file mode 100644
index 3b8379ea3..000000000
--- a/testing/gdm/fix_crasher_with_gtk307.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 045c319f2655fc45c24951479eb9cd1e59792cef Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Sat, 2 Apr 2011 04:10:09 +0200
-Subject: [PATCH] simple-greeter: Don't request an invalid size
-
-GTK widgets must at all times report a size they can handle. So it is
-not allowed to return 0 when not realized, because then size allocations
-break when GTK uses this size for its widget.
-In this case, GTK uses the pre-realize size to determine the size it
-should request when creating the greeter window - chicken and egg so to
-say.
-
-This patch just uses the default monitor (I guess the root window's
-monitor is the default monitor?) for determining the login window size.
-
-One thing this patch doesn't do is add a call to gtk_widget_queue_resize()
-from the realize callback or from monitor-changing signals, though
-that's probably technically necessary.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646498
----
- gui/simple-greeter/gdm-greeter-login-window.c |   28 +++++++++----------------
- 1 files changed, 10 insertions(+), 18 deletions(-)
-
-diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index abd6707..3ec9a09 100644
---- a/gui/simple-greeter/gdm-greeter-login-window.c
-+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1413,25 +1413,22 @@ gdm_greeter_login_window_get_preferred_width (GtkWidget *widget,
- {
-         int             monitor;
-         GdkScreen      *screen;
-+        GdkWindow      *window;
-         GdkRectangle    area;
-         GtkAllocation   widget_allocation;
-         int             min_size;
-         int             nat_size;
- 
--        min_size = 0;
--        nat_size = 0;
--
--        if (!gtk_widget_get_realized (widget)) {
--                goto out;
--        }
--
-         gtk_widget_get_preferred_width (gtk_bin_get_child (GTK_BIN (widget)),
-                                         &min_size,
-                                         &nat_size);
- 
-         /* Make width be at least 33% screen width */
-         screen = gtk_widget_get_screen (widget);
--        monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget));
-+        window = gtk_widget_get_window (widget);
-+        if (window == NULL)
-+          window = gdk_screen_get_root_window (screen);
-+        monitor = gdk_screen_get_monitor_at_window (screen, window);
-         gdk_screen_get_monitor_geometry (screen, monitor, &area);
-         min_size = MAX (min_size, .33 * area.width);
-         nat_size = MAX (nat_size, .33 * area.width);
-@@ -1442,7 +1439,6 @@ gdm_greeter_login_window_get_preferred_width (GtkWidget *widget,
-         min_size = MAX (min_size, widget_allocation.width);
-         nat_size = MAX (nat_size, widget_allocation.width);
- 
-- out:
-         if (minimum_size)
-                 *minimum_size = min_size;
-         if (natural_size)
-@@ -1456,29 +1452,25 @@ gdm_greeter_login_window_get_preferred_height (GtkWidget *widget,
- {
-         int             monitor;
-         GdkScreen      *screen;
-+        GdkWindow      *window;
-         GdkRectangle    area;
-         int             min_size;
-         int             nat_size;
- 
--        min_size = 0;
--        nat_size = 0;
--
--        if (!gtk_widget_get_realized (widget)) {
--                goto out;
--        }
--
-         gtk_widget_get_preferred_height (gtk_bin_get_child (GTK_BIN (widget)),
-                                         &min_size,
-                                         &nat_size);
- 
-         /* Make height be at most 80% of screen height */
-         screen = gtk_widget_get_screen (widget);
--        monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (widget));
-+        window = gtk_widget_get_window (widget);
-+        if (window == NULL)
-+          window = gdk_screen_get_root_window (screen);
-+        monitor = gdk_screen_get_monitor_at_window (screen, window);
-         gdk_screen_get_monitor_geometry (screen, monitor, &area);
-         min_size = MIN (min_size, .8 * area.height);
-         nat_size = MIN (nat_size, .8 * area.height);
- 
-- out:
-         if (minimum_size)
-                 *minimum_size = min_size;
-         if (natural_size)
--- 
-1.7.4
-\ No newline at end of file
diff --git a/testing/gdm/gdm b/testing/gdm/gdm
deleted file mode 100755
index c3e635a6d..000000000
--- a/testing/gdm/gdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting GDM"
-    /usr/sbin/gdm &
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      
-      add_daemon gdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping GDM"
-    [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon gdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/gdm/gdm-autologin.pam b/testing/gdm/gdm-autologin.pam
deleted file mode 100644
index 7c2f9a985..000000000
--- a/testing/gdm/gdm-autologin.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth		requisite	pam_nologin.so
-auth		required	pam_env.so
-auth		required	pam_permit.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_limits.so
-session		required	pam_unix.so
diff --git a/testing/gdm/gdm-vt-allocation-hack.patch b/testing/gdm/gdm-vt-allocation-hack.patch
deleted file mode 100644
index 56fa5a151..000000000
--- a/testing/gdm/gdm-vt-allocation-hack.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
-index 39def47..03488fd 100644
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
-@@ -33,6 +33,8 @@
- #include <grp.h>
- #include <signal.h>
- #include <sys/resource.h>
-+#include <sys/ioctl.h>
-+#include <sys/vt.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
-         return out;
- }
- 
-+#ifndef O_NOCTTY
-+# define O_NOCTTY 0
-+#endif
-+
-+static int
-+open_vt (int vtno)
-+{
-+	char *vtname;
-+	int fd;
-+
-+	vtname = g_strdup_printf ("/dev/tty%d", vtno);
-+
-+	do {
-+		errno = 0;
-+		fd = open (vtname, O_RDWR | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	g_free (vtname);
-+	return fd;
-+}
-+
-+static gint
-+find_first_probably_free_vt (void)
-+{
-+	int fd, fdv;
-+	int vtno;
-+	unsigned short vtmask;
-+	struct vt_stat vtstat;
-+	guint v_state;
-+
-+	fdv = -1;
-+
-+	do {
-+		errno = 0;
-+		fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	if (fd >= 0) {
-+		if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) {
-+			v_state = vtstat.v_state;
-+		} else {
-+			close (fd);
-+			v_state = 0;
-+			fd = -1;
-+		}
-+	} else {
-+		v_state = 0;
-+	}
-+
-+	if (fd < 0) {
-+		do {
-+			errno = 0;
-+			fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0);
-+		} while (errno == EINTR);
-+
-+		if (fd >= 0) {
-+			if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0)
-+				v_state = vtstat.v_state;
-+		}
-+	}
-+
-+	for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) {
-+		/* Is this console in use? */
-+		if (v_state & vtmask)
-+			continue;
-+
-+		/* No, try to open it */
-+		fdv = open_vt (vtno);
-+		if (fdv >= 0)
-+			break;
-+
-+		/* If we're here, kernel indicated that the console was free,
-+		 * but we failed to open it. Just go on to higher VTs. */
-+	}
-+
-+        if (fdv >= 0)
-+                close (fdv);
-+        else
-+		vtno = -1;
-+
-+	if (fd >= 0)
-+		close (fd);
-+
-+	return vtno;
-+}
-+
- char *
- gdm_server_get_display_device (GdmServer *server)
- {
-@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer  *server,
- 
-         if (vtarg != NULL && ! gotvtarg) {
-                 argv[len++] = g_strdup (vtarg);
-+        } else if (!query_in_arglist && !gotvtarg) {
-+                gint vtnum = find_first_probably_free_vt ();
-+
-+                if (vtnum > 0)
-+                        argv [len++] = g_strdup_printf ("vt%d", vtnum);
-         }
- 
-         argv[len++] = NULL;
diff --git a/testing/gdm/gdm.install b/testing/gdm/gdm.install
deleted file mode 100644
index 6cd981d77..000000000
--- a/testing/gdm/gdm.install
+++ /dev/null
@@ -1,27 +0,0 @@
-pkgname=gdm
-
-post_install() {
-  getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
-  getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
-  passwd -l gdm > /dev/null
-  chown -R gdm:gdm /var/lib/gdm > /dev/null
-
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  gconfpkg --install ${pkgname}
-}
-
-pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    gconfpkg --uninstall ${pkgname}
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  getent passwd gdm >/dev/null 2>&1 && userdel gdm
-  getent group gdm >/dev/null 2>&1 && groupdel gdm
-}
diff --git a/testing/gdm/gdm.pam b/testing/gdm/gdm.pam
deleted file mode 100644
index 655299cb7..000000000
--- a/testing/gdm/gdm.pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-auth            optional        pam_gnome_keyring.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_gnome_keyring.so auto_start
-password        required        pam_unix.so
diff --git a/testing/gedit/PKGBUILD b/testing/gedit/PKGBUILD
deleted file mode 100644
index 42b189676..000000000
--- a/testing/gedit/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 120727 2011-04-26 07:34:29Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gedit
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="A text editor for GNOME"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant'
-         'iso-codes' 'libsm' 'desktop-file-utils' 'pygobject')
-makedepends=('gnome-doc-utils' 'intltool')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gedit.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a91fcfe321d8d5d8fe5c6c11f3b05389febe396efa2172b5ea6cb79d2f16b2db')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib --disable-scrollkeeper \
-      --disable-updater --disable-schemas-compile \
-      --enable-python
-  make
-}
-
-package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gedit/gedit.install b/testing/gedit/gedit.install
deleted file mode 100644
index 9d88a1341..000000000
--- a/testing/gedit/gedit.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-    update-desktop-database -q
-}
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/gedit.schemas ]; then
-        usr/sbin/gconfpkg --uninstall gedit
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/gimp-devel/PKGBUILD b/testing/gimp-devel/PKGBUILD
deleted file mode 100644
index 077e66f4f..000000000
--- a/testing/gimp-devel/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 119839 2011-04-15 18:55:33Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gimp-devel
-pkgver=2.7.2
-pkgrel=1
-pkgdesc="GNU Image Manipulation Program (Development Version)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gimp.org/"
-license=('GPL')
-depends=('gtk2' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \
-         'libexif' 'pygtk' 'desktop-file-utils' 'gegl' 'hicolor-icon-theme')
-makedepends=('gutenprint' 'intltool' 'libwebkit' 'gnome-python' 'poppler-glib' \
-             'pkg-config' 'alsa-lib' 'iso-codes')
-optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
-            'libwebkit: for the help browser'
-            'poppler-glib: for pdf support'
-            'alsa-lib: for MIDI event controller module')
-options=('!libtool' '!makeflags')
-conflicts=('gimp')
-provides=("gimp=${pkgver}")
-install=gimp-devel.install
-source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl)
-md5sums=('6996138ab70b0bfebfe9f563284e5f78'
-         'bb27bc214261d36484093e857f015f38')
-sha1sums=('4690420961d110f99448c32fe61aae7d4869a863'
-          '110ce9798173b19a662d086ed7b882b4729f06cf')
-
-build() {
-  cd "${srcdir}/gimp-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-mp --enable-gimp-console --enable-gimp-remote \
-    --enable-python --with-gif-compression=lzw \
-    --without-aa --without-hal
-  make
-}
-
-package() {
-  cd "${srcdir}/gimp-${pkgver}"
-  make DESTDIR="${pkgdir}" install-strip
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
-
-  install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl"
-
-  ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
-  ln -sf gimp-remote-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-remote.1.gz"
-  ln -sf gimprc-${pkgver%.*}.5.gz "${pkgdir}/usr/share/man/man5/gimprc.5.gz"
-  ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
-  ln -s gimp-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp.1.gz"
-
-  ln -s gimp-${pkgver%.*} "${pkgdir}/usr/bin/gimp"
-  ln -s gimp-console-${pkgver%.*} "${pkgdir}/usr/bin/gimp-console"
-  ln -s gimp-remote-${pkgver%.*} "${pkgdir}/usr/bin/gimp-remote"
-  ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
-}
diff --git a/testing/gimp-devel/gimp-devel.install b/testing/gimp-devel/gimp-devel.install
deleted file mode 100644
index c317fbaca..000000000
--- a/testing/gimp-devel/gimp-devel.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gimp-devel/linux.gpl b/testing/gimp-devel/linux.gpl
deleted file mode 100644
index 0a73d8979..000000000
--- a/testing/gimp-devel/linux.gpl
+++ /dev/null
@@ -1,19 +0,0 @@
-GIMP Palette
-Name: linux
-#
-  0   0   0
-  0   0 170
-  0 170   0
-  0 170 170
-170   0   0
-170   0 170
-170  85   0
-170 170 170
- 85  85  85
- 85  85 255
- 85 255  85
- 85 255 255
-255  85  85
-255  85 255
-255 255  85
-255 255 255
diff --git a/testing/gimp/PKGBUILD b/testing/gimp/PKGBUILD
deleted file mode 100644
index 04637f310..000000000
--- a/testing/gimp/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 119782 2011-04-15 08:31:34Z jgc $
-# Maintainer: tobias <tobias@archlinux.org>
-
-pkgname=gimp
-pkgver=2.6.11
-pkgrel=5
-pkgdesc="GNU Image Manipulation Program"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gimp.org/"
-license=('GPL')
-depends=('gtk2' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \
-         'libexif' 'pygtk' 'desktop-file-utils' 'gegl')
-makedepends=('gutenprint' 'intltool' 'libwebkit' 'gnome-python' 'poppler-glib' \
-             'pkg-config' 'alsa-lib' 'iso-codes')
-optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
-            'libwebkit: for the help browser'
-            'poppler-glib: for pdf support'
-            'alsa-lib: for MIDI event controller module')
-options=('!libtool' '!makeflags')
-conflicts=('gimp-devel')
-install=gimp.install
-source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl)
-md5sums=('bb2939fe13e54fc7255cef5d097bb5dd'
-         'bb27bc214261d36484093e857f015f38')
-sha1sums=('2f9d596e727bdbf304fa78257c1731d9faf3934c'
-          '110ce9798173b19a662d086ed7b882b4729f06cf')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-mp --enable-gimp-console --enable-gimp-remote \
-    --enable-python --with-gif-compression=lzw \
-    --without-aa --without-hal
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install-strip
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
-  install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl"
-
-  rm "${pkgdir}/usr/share/man/man1/gimp-console.1"
-  ln -s gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
-  ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
-  ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
-}
diff --git a/testing/gimp/gimp.install b/testing/gimp/gimp.install
deleted file mode 100644
index c317fbaca..000000000
--- a/testing/gimp/gimp.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gimp/linux.gpl b/testing/gimp/linux.gpl
deleted file mode 100644
index 0a73d8979..000000000
--- a/testing/gimp/linux.gpl
+++ /dev/null
@@ -1,19 +0,0 @@
-GIMP Palette
-Name: linux
-#
-  0   0   0
-  0   0 170
-  0 170   0
-  0 170 170
-170   0   0
-170   0 170
-170  85   0
-170 170 170
- 85  85  85
- 85  85 255
- 85 255  85
- 85 255 255
-255  85  85
-255  85 255
-255 255  85
-255 255 255
diff --git a/testing/gjs/PKGBUILD b/testing/gjs/PKGBUILD
deleted file mode 100644
index 5a7efd2f0..000000000
--- a/testing/gjs/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 117650 2011-04-04 14:59:48Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=gjs
-pkgver=0.7.14
-pkgrel=1
-pkgdesc="Javascript Bindings for GNOME"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://live.gnome.org/Gjs"
-license=('GPL')
-depends=('gobject-introspection' 'xulrunner')
-options=('!libtool')
-source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3af6f449a505c419d4a0e5938737da8d1b9b09b33710cc1ac1edee2eaa86e348')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|python|python2|' scripts/make-tests
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/glade/PKGBUILD b/testing/glade/PKGBUILD
deleted file mode 100644
index fc846ce15..000000000
--- a/testing/glade/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 118419 2011-04-06 17:54:27Z ibiru $
-# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=glade
-pkgver=3.10.0
-pkgrel=2
-pkgdesc="User interface builder for GTK+ and GNOME."
-arch=(i686 x86_64 'mips64el')
-license=('GPL' 'LGPL')
-depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'pygobject-devel')
-optdepends=('python2: Python widgets support')
-options=('!libtool')
-url="http://glade.gnome.org/"
-install=glade.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7e6a1423f1697d8b40618d0b01f0ebff572ccb80f5818a36af0971c5d1d94253')
-
-build() {
-  cd "${srcdir}/$pkgname-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/glade/glade.install b/testing/glade/glade.install
deleted file mode 100644
index bce670aff..000000000
--- a/testing/glade/glade.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/glib-networking/PKGBUILD b/testing/glib-networking/PKGBUILD
deleted file mode 100644
index f7c87770a..000000000
--- a/testing/glib-networking/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 121199 2011-04-29 10:51:43Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-pkgname=glib-networking
-pkgver=2.28.6.1
-pkgrel=2
-pkgdesc="Network-related giomodules for glib"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas')
-makedepends=('intltool')
-options=('!libtool')
-install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*.*}/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('50f9aac36ce49b0e16f84a9f516cf59d0a1f9b3199634787fd9db7470ab6c65b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr  --sysconfdir=/etc \
-    --libexecdir=/usr/lib/glib-networking --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/glib-networking/glib-networking.install b/testing/glib-networking/glib-networking.install
deleted file mode 100644
index 595f1c75b..000000000
--- a/testing/glib-networking/glib-networking.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/gio-querymodules usr/lib/gio/modules
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD
deleted file mode 100644
index 8ca822c20..000000000
--- a/testing/glib2/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 119742 2011-04-14 11:29:04Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=glib2
-pkgver=2.28.6
-pkgrel=1
-pkgdesc="Common C routines used by GTK+ and other libs"
-url="http://www.gtk.org/"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL')
-depends=('pcre>=8.02')
-makedepends=('pkgconfig' 'python2')
-options=('!libtool' '!docs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.bz2
-        glib2.sh
-        glib2.csh)
-sha256sums=('557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578'
-            '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a'
-            '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3')
-
-build() {
-  cd "${srcdir}/glib-${pkgver}"
-  ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --with-pcre=system \
-      --disable-fam
-  make
-}
-
-package() {
-  cd "${srcdir}/glib-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}/etc/profile.d"
-  install -m755 "${srcdir}/glib2.sh" "${pkgdir}/etc/profile.d/"
-  install -m755 "${srcdir}/glib2.csh" "${pkgdir}/etc/profile.d/"
-
-  for _i in "${pkgdir}/etc/bash_completion.d/"*; do
-      chmod -x "${_i}"
-  done
-}
diff --git a/testing/glib2/glib2.csh b/testing/glib2/glib2.csh
deleted file mode 100644
index 7aa3a2ffa..000000000
--- a/testing/glib2/glib2.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv G_BROKEN_FILENAMES 1
diff --git a/testing/glib2/glib2.sh b/testing/glib2/glib2.sh
deleted file mode 100644
index 96a056e1e..000000000
--- a/testing/glib2/glib2.sh
+++ /dev/null
@@ -1 +0,0 @@
-export G_BROKEN_FILENAMES=1
diff --git a/testing/glibmm/PKGBUILD b/testing/glibmm/PKGBUILD
deleted file mode 100644
index 50eb6cad7..000000000
--- a/testing/glibmm/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 118216 2011-04-05 22:43:03Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase=glibmm
-pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.28.0
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-makedepends=('glib2' 'libsigc++2.0' 'pkgconfig' 'mm-common')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool')
-url="http://gtkmm.sourceforge.net/"
-sha256sums=('b1b99868896b028354141e3b2470d98799283e90154550e12614f692db17a5a3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package_glibmm() {
-  pkgdesc="Glib-- (glibmm) is a C++ interface for glib"
-  depends=('glib2' 'libsigc++2.0')
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-  make DESTDIR="${pkgdir}" install
-}
-
-package_glibmm-docs() {
-  pkgdesc="Developer documentation for glibmm"
-  cd "${srcdir}/${pkgbase}-${pkgver}/docs"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-applets/PKGBUILD b/testing/gnome-applets/PKGBUILD
deleted file mode 100644
index fe9bc25e6..000000000
--- a/testing/gnome-applets/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 113478 2011-03-08 21:10:38Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-applets
-pkgver=2.91.4
-pkgrel=2
-pkgdesc="GNOME Applets"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify' 'cpufrequtils')
-makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager' 'gnome-common')
-options=(!emptydirs)
-url="http://www.gnome.org"
-groups=(gnome)
-install=gnome-applets.install
-#source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2)
-source=(${pkgname}-${pkgver}.tar.xz)
-sha256sums=('950ab962c39fca9375a9df0827ccb8f2178f7e84950c8fdbea5e3d2f9889a49c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./autogen.sh
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \
-      --localstatedir=/var --disable-static \
-      --disable-scrollkeeper --disable-schemas-install \
-      --without-hal
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-applets-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-applets/gnome-applets.install b/testing/gnome-applets/gnome-applets.install
deleted file mode 100644
index dd9c34269..000000000
--- a/testing/gnome-applets/gnome-applets.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gnome-applets
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
deleted file mode 100644
index a76c1e73c..000000000
--- a/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-# Get access to /dev/rfkill for users
-# See https://bugzilla.redhat.com/show_bug.cgi?id=514798
-#
-# Updated for udev >= 154
-# http://bugs.debian.org/582188
-# https://bugzilla.redhat.com/show_bug.cgi?id=588660
-
-ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end"
-ACTION!="add|change", GOTO="gnome_bluetooth_end"
-KERNEL=="rfkill", TAG+="udev-acl"
-LABEL="gnome_bluetooth_end"
diff --git a/testing/gnome-bluetooth/PKGBUILD b/testing/gnome-bluetooth/PKGBUILD
deleted file mode 100644
index eaf8911b5..000000000
--- a/testing/gnome-bluetooth/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 117688 2011-04-04 16:21:47Z ibiru $
-# Maintainer:
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-bluetooth
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="The GNOME Bluetooth Subsystem"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://live.gnome.org/GnomeBluetooth"
-license=('GPL' 'LGPL')
-depends=('gnome-control-center' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-install=gnome-bluetooth.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2
-        61-gnome-bluetooth-rfkill.rules)
-sha256sums=('bdfa7986b8b7f622b48a70b29a48016482190d240de499da5d7fddb48ed4c211'
-            'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-desktop-update \
-    --disable-icon-update \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m644 -D "${srcdir}/61-gnome-bluetooth-rfkill.rules" \
-                     "${pkgdir}/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules"
-  install -d ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/gnome-bluetooth" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
-}
diff --git a/testing/gnome-bluetooth/gnome-bluetooth.install b/testing/gnome-bluetooth/gnome-bluetooth.install
deleted file mode 100644
index 927142ee0..000000000
--- a/testing/gnome-bluetooth/gnome-bluetooth.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/gnome-color-manager/PKGBUILD b/testing/gnome-color-manager/PKGBUILD
deleted file mode 100644
index ba2906101..000000000
--- a/testing/gnome-color-manager/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 117742 2011-04-04 17:38:36Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=gnome-color-manager
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Color profile manager for the GNOME desktop"
-arch=(i686 x86_64 'mips64el')
-url="http://projects.gnome.org/gnome-color-manager/"
-license=(GPL2)
-depends=(lcms2 gnome-settings-daemon gnome-control-center vte3 sane exiv2
-         hicolor-icon-theme desktop-file-utils)
-makedepends=(intltool gtk-doc)
-install=gnome-color-manager.install
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('9e030b2a5dd61010bce25c2e3cdfca6e7ab3954fecb74dbf88f6a8e2c70b7207')
-
-build(){
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # man pages need docbook-sgml, which we don't have
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --libexecdir=/usr/lib --disable-static --disable-man-pages
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-color-manager/gnome-color-manager.install b/testing/gnome-color-manager/gnome-color-manager.install
deleted file mode 100644
index 04fda0ddc..000000000
--- a/testing/gnome-color-manager/gnome-color-manager.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-color-manager
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD
deleted file mode 100644
index 1a694aff9..000000000
--- a/testing/gnome-control-center/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 120905 2011-04-27 08:37:19Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.0.1.1
-pkgrel=1
-pkgdesc="The Control Center for GNOME"
-arch=('i686' 'x86_64' 'mips64el')
-depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
-            'apg: adds password generation for user accounts')
-makedepends=('gnome-doc-utils' 'intltool' 'networkmanager')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-control-center.install
-license=('GPL')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b191991d3932b363154e6cf2b5055bc711272065397daee2163b6fb04402ad79')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-scrollkeeper --disable-update-mimedb
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
-
diff --git a/testing/gnome-control-center/gnome-control-center.install b/testing/gnome-control-center/gnome-control-center.install
deleted file mode 100644
index eb703319f..000000000
--- a/testing/gnome-control-center/gnome-control-center.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gnome-control-center
-
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        usr/sbin/gconfpkg --uninstall ${pkgname}
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/gnome-desktop-sharp/PKGBUILD b/testing/gnome-desktop-sharp/PKGBUILD
deleted file mode 100644
index 0ca1779fb..000000000
--- a/testing/gnome-desktop-sharp/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 121043 2011-04-28 09:15:35Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-desktop-sharp
-pkgver=2.26.0
-pkgrel=6
-pkgdesc="GNOME desktop bindings for C#"
-arch=('i686' 'x86_64')
-license=(LGPL)
-url="http://gtk-sharp.sourceforge.net"
-depends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libwnck' 'gtkhtml' 'gtksourceview2')
-makedepends=('monodoc' 'libgnomeprintui')
-optdepends=('libgnomeprintui')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
-	gnome-desktop-sharp-lib-target.patch)
-md5sums=('4bc990900bb318b2ba0b0e7998bb47d1'
-         '980cd3adf5e745f4caee0a172a51dcc3')
-
-build() {
- # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR="$srcdir/wapi"
-  mkdir -p "$MONO_SHARED_DIR"
-
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i $srcdir/gnome-desktop-sharp-lib-target.patch
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make GACUTIL="/usr/bin/gacutil /root ${pkgdir}/usr/lib" \
-      DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-desktop-sharp/gnome-desktop-sharp-lib-target.patch b/testing/gnome-desktop-sharp/gnome-desktop-sharp-lib-target.patch
deleted file mode 100644
index 3f0ea4933..000000000
--- a/testing/gnome-desktop-sharp/gnome-desktop-sharp-lib-target.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- gnome-desktop-sharp-2.26.0/gnomedesktop/gnomedesktop-sharp.dll.config.in.false	2009-02-23 19:01:27.000000000 +0100
-+++ gnome-desktop-sharp-2.26.0/gnomedesktop/gnomedesktop-sharp.dll.config.in	2010-02-11 15:59:36.000000000 +0100
-@@ -3,5 +3,5 @@
-   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-   <dllmap dll="libgthread-2.0-0.dll" target="libgthread-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
-   <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/>
--  <dllmap dll="gnome-desktop-2" target="libgnome-desktop-2@LIB_PREFIX@.11@LIB_SUFFIX@"/>
-+  <dllmap dll="gnome-desktop-2" target="libgnome-desktop-2@LIB_PREFIX@.17@LIB_SUFFIX@"/>
- </configuration>
diff --git a/testing/gnome-desktop/PKGBUILD b/testing/gnome-desktop/PKGBUILD
deleted file mode 100644
index de382038d..000000000
--- a/testing/gnome-desktop/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 120873 2011-04-26 21:57:00Z ibiru $
-# Maintainer:  Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-desktop
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="Library with common API for various GNOME modules"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL' 'LGPL')
-depends=('gsettings-desktop-schemas' 'startup-notification' 'gtk3')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6d5e140a0d5f9bc131caff505bc4a2afa11e1839437f7fc3da73238b37a3f0a3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --with-gnome-distributor="Arch Linux" \
-      --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-desktop2/PKGBUILD b/testing/gnome-desktop2/PKGBUILD
deleted file mode 100644
index 3829d54f7..000000000
--- a/testing/gnome-desktop2/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 121039 2011-04-28 07:31:32Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor:  Jan de Groot <jan@archlinux.org>
-
-_pkgname=gnome-desktop
-pkgname=${_pkgname}2
-pkgver=2.32.1
-pkgrel=1
-pkgdesc="The GNOME Desktop"
-arch=(i686 x86_64)
-license=(GPL LGPL)
-depends=(gconf gtk2 startup-notification)
-makedepends=(gnome-doc-utils intltool)
-url="http://www.gnome.org"
-options=(!libtool !emptydirs)
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2)
-sha256sums=('55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --with-gnome-distributor="Archlinux" \
-      --disable-scrollkeeper \
-      --disable-gnome-about --disable-desktop-docs
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-disk-utility/PKGBUILD b/testing/gnome-disk-utility/PKGBUILD
deleted file mode 100644
index 0a5f8e9a6..000000000
--- a/testing/gnome-disk-utility/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 117728 2011-04-04 17:27:54Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-disk-utility
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="GNOME libraries and applications for dealing with storage devices"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.gnome.org"
-depends=('dbus-glib' 'libgnome-keyring' 'libunique3' 'udisks' 'libnotify' 'hicolor-icon-theme' 'avahi')
-makedepends=('gtk-doc' 'intltool')
-options=('!libtool' '!emptydirs')
-install=gnome-disk-utility.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        fix-freeze.patch)
-sha256sums=('94d31142a5f488d034cd2954df4ab1c26bd053fb0d46d230fba91b4f8b3663fb'
-            '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-freeze.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-disk-utility \
-      --disable-scrollkeeper --disable-nautilus --disable-gtk-doc
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-disk-utility/fix-freeze.patch b/testing/gnome-disk-utility/fix-freeze.patch
deleted file mode 100644
index 262748bfb..000000000
--- a/testing/gnome-disk-utility/fix-freeze.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 82489b51443e1280dfb9fb251ea2693df1809aec Mon Sep 17 00:00:00 2001
-From: Pascal Terjan <pterjan@mandriva.com>
-Date: Mon, 3 May 2010 14:01:22 +0200
-Subject: [PATCH] Force GduPresentable ids to be UTF-8 (#616198)
-
-GduPresentable created in gdu pool include intheir id some strings
-in local encoding like _("Peripheral Devices"). This patch
-enforces them to be UTF-8.
-
-This fixes a crash of gvfs-gdu-volume-monitor when USB devices are
-available on a non UTF-8 system.
----
- src/gdu/gdu-pool.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/src/gdu/gdu-pool.c b/src/gdu/gdu-pool.c
-index bd5eccf..cf6be53 100644
---- a/src/gdu/gdu-pool.c
-+++ b/src/gdu/gdu-pool.c
-@@ -473,6 +473,9 @@ gdu_pool_class_init (GduPoolClass *klass)
-                               g_cclosure_marshal_VOID__OBJECT,
-                               G_TYPE_NONE, 1,
-                               GDU_TYPE_PRESENTABLE);
-+#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
-+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-+#endif
- }
- 
- static void
--- 
-1.7.1
-
diff --git a/testing/gnome-disk-utility/gnome-disk-utility.install b/testing/gnome-disk-utility/gnome-disk-utility.install
deleted file mode 100644
index 43ed0a554..000000000
--- a/testing/gnome-disk-utility/gnome-disk-utility.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD
deleted file mode 100644
index ff10f5bea..000000000
--- a/testing/gnome-games/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 120383 2011-04-23 09:47:40Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-games
-pkgver=3.0.1.1
-pkgrel=2
-pkgdesc="Some Games for GNOME"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-provides=('glchess')
-conflicts=('glchess')
-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.bz2)
-sha256sums=('dbbda8aa6960e36acff7537e49e033fc8037e6b3b3aa52d5f066cb67b34b4319')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper \
-      --disable-static \
-      --with-scores-user=root --with-scores-group=games \
-      --enable-introspection=yes
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  # Remove all scores, we generate them from postinstall
-  rm -rf "${pkgdir}/var"
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-games ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-games/gnome-games.install b/testing/gnome-games/gnome-games.install
deleted file mode 100644
index 1f67c2e01..000000000
--- a/testing/gnome-games/gnome-games.install
+++ /dev/null
@@ -1,153 +0,0 @@
-pkgname=gnome-games
-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() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  usr/sbin/gconfpkg --install ${pkgname}
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
-  for sz in Large Medium Small; do
-    if [ -e "opt/gnome/var/games/same-gnome.${sz}.scores" ]; then
-      mv "opt/gnome/var/games/same-gnome.${sz}.scores" \
-        "var/games/swell-foop.${sz}.scores"
-    elif [ -e "var/games/same-gnome.${sz}.scores" ]; then
-      mv "var/games/same-gnome.${sz}.scores" \
-        "var/games/swell-foop.${sz}.scores"
-    fi
-  done
-  if [ -e "opt/gnome/var/games/gnometris.scores" ]; then
-    mv "opt/gnome/var/games/gnometris.scores" \
-      "var/games/quadrapassel.scores"
-  elif [ -e "var/games/gnometris.scores" ]; then
-    mv "var/games/gnometris.scores" \
-      "var/games/quadrapassel.scores"
-  fi
-
-  for score in "${scores[@]}" ; do
-    if [ -e "var/games/${score}" ]; then
-      continue
-    fi
-    if [ -e "opt/gnome/var/games/${score}" ]; then
-      mv "opt/gnome/var/games/${score}" var/games/
-    else
-      touch "var/games/${score}"
-    fi
-    chown root:games "var/games/${score}"
-    chmod 664 "var/games/${score}"
-  done
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-
-  if [ -f usr/share/ggz/gnect-client.dsc ]; then
-    ggz-config -r -m usr/share/ggz/gnect-client.dsc >& /dev/null
-    ggz-config -r -m usr/share/ggz/gnibbles-client.dsc >& /dev/null
-    ggz-config -r -m usr/share/ggz/iagno-client.dsc >& /dev/null
-  fi
-}
-
-post_remove() {
-  usr/bin/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/gnome-keyring/PKGBUILD b/testing/gnome-keyring/PKGBUILD
deleted file mode 100644
index 6488fc2dd..000000000
--- a/testing/gnome-keyring/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-#$Id: PKGBUILD 120584 2011-04-25 17:40:10Z ibiru $
-# Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=gnome-keyring
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="GNOME Password Management daemon"
-arch=(i686 x86_64 'mips64el')
-license=('GPL' 'LGPL')
-depends=('gtk3' 'dconf')
-makedepends=('intltool' 'pkgconfig' 'python2')
-groups=('gnome')
-options=('!libtool' '!emptydirs' '!makeflags')
-url="http://www.gnome.org"
-install=gnome-keyring.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1b296fc58fb189c9632fdd8a8a8a2dbb0af97db1529af87d73e21a96c4b78c03')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-keyring \
-      --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-keyring/gnome-keyring.install b/testing/gnome-keyring/gnome-keyring.install
deleted file mode 100644
index e5204bcab..000000000
--- a/testing/gnome-keyring/gnome-keyring.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/gnome-media/PKGBUILD b/testing/gnome-media/PKGBUILD
deleted file mode 100644
index 1f0927322..000000000
--- a/testing/gnome-media/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 111636 2011-02-27 21:57:39Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-media
-pkgver=2.91.2
-pkgrel=2
-pkgdesc="GNOME Media Tools"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libgnome-media-profiles' 'libcanberra' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils')
-url="http://www.gnome.org"
-groups=('gnome')
-replaces=('gnome-media-pulse')
-options=('!libtool' '!emptydirs')
-install=gnome-media.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4aadc834d04c3d6f573fad667a69c6dc9668240e759cbd8cfb14d053d8e4da5f')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-media \
-      --localstatedir=/var --disable-static \
-      --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgbase}.schemas" --domain gnome-media-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
-  rm -rf "${pkgdir}/usr/share/sounds/"
-}
diff --git a/testing/gnome-media/gnome-media.install b/testing/gnome-media/gnome-media.install
deleted file mode 100644
index 97488b6d0..000000000
--- a/testing/gnome-media/gnome-media.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gnome-media
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
diff --git a/testing/gnome-media/gnome_volume_control_fix_channel_bars.patch b/testing/gnome-media/gnome_volume_control_fix_channel_bars.patch
deleted file mode 100644
index 9d3de0331..000000000
--- a/testing/gnome-media/gnome_volume_control_fix_channel_bars.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur gnome-media-2.32.0/gnome-volume-control/src/gvc-channel-bar.c gnome-media-2.32.0.new/gnome-volume-control/src/gvc-channel-bar.c
---- gnome-media-2.32.0/gnome-volume-control/src/gvc-channel-bar.c	2010-09-28 15:46:15.000000000 +0100
-+++ gnome-media-2.32.0.new/gnome-volume-control/src/gvc-channel-bar.c	2010-12-31 15:14:23.964994328 +0000
-@@ -449,7 +449,7 @@
-                 /* Switch side scroll to vertical */
-                 if (direction == GDK_SCROLL_RIGHT)
-                         direction = GDK_SCROLL_UP;
--                else if (GDK_SCROLL_LEFT)
-+                else if (direction == GDK_SCROLL_LEFT)
-                         direction = GDK_SCROLL_DOWN;
-         }
- 
diff --git a/testing/gnome-menus/PKGBUILD b/testing/gnome-menus/PKGBUILD
deleted file mode 100644
index 682651e66..000000000
--- a/testing/gnome-menus/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 120868 2011-04-26 21:47:42Z ibiru $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-menus
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="GNOME menu specifications"
-arch=('i686' 'x86_64' 'mips64el')
-depends=('glib2' 'python2')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-license=('GPL' 'LGPL')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        menus.patch)
-sha256sums=('579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0'
-            'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np0 -i "$srcdir/menus.patch"
-
-  PYTHON=/usr/bin/python2 ./configure \
-      --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var  --disable-static
-  make
-}
-
-package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  sed -i "1s|#!/usr/bin/env python$|&2|" \
-    "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py"
-}
diff --git a/testing/gnome-menus/menus.patch b/testing/gnome-menus/menus.patch
deleted file mode 100644
index bf73e86cd..000000000
--- a/testing/gnome-menus/menus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- layout/applications.menu	2005-06-28 10:16:39.000000000 +0200
-+++ layout/applications.menu	2005-09-12 23:21:20.000000000 +0200
-@@ -7,7 +7,6 @@
-   <Directory>Applications.directory</Directory>
- 
-   <!-- Scan legacy dirs first, as later items take priority -->
--  <KDELegacyDirs/>
-   <LegacyDir>/etc/X11/applnk</LegacyDir>
-   <LegacyDir>/usr/share/gnome/apps</LegacyDir>
- 
-@@ -18,6 +17,14 @@
-   <!-- Read in overrides and child menus from applications-merged/ -->
-   <DefaultMergeDirs/>
- 
-+  <!-- Archlinux submenu -->
-+  <Menu>
-+    <Name>Archlinux</Name>
-+    <Directory>Archlinux.directory</Directory>
-+    <Include>
-+      <Category>Archlinux</Category>
-+    </Include>
-+  </Menu> <!-- End Archlinux -->
-   <!-- Accessories submenu -->
-   <Menu>
-     <Name>Accessories</Name>
diff --git a/testing/gnome-nettool/PKGBUILD b/testing/gnome-nettool/PKGBUILD
deleted file mode 100644
index 60fdc0d4f..000000000
--- a/testing/gnome-nettool/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 117582 2011-04-04 11:28:21Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Kritoke <kritoke@nospam.gmail.com>
-
-pkgname=gnome-nettool
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="A Collection of GNOME3 Networking Tools."
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('gtk3' 'libgtop' 'dnsutils' 'netkit-bsd-finger' 'whois' 'hicolor-icon-theme')
-makedepends=('gnome-doc-utils' 'pkgconfig' 'intltool')
-groups=('gnome-extra')
-url="http://www.gnome.org"
-install=gnome-nettool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6b75ee5de54fae67db0ba710e8b334a5b1fcd18719d38ae09b9dd05f5e2555e9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-nettool/gnome-nettool.install b/testing/gnome-nettool/gnome-nettool.install
deleted file mode 100644
index 738f7859f..000000000
--- a/testing/gnome-nettool/gnome-nettool.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-panel/PKGBUILD b/testing/gnome-panel/PKGBUILD
deleted file mode 100644
index c2c7931bd..000000000
--- a/testing/gnome-panel/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 119512 2011-04-11 20:09:24Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-panel
-pkgver=3.0.0.1
-pkgrel=3
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-pkgdesc="The GNOME Panel"
-url="http://www.gnome.org"
-depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf' 'telepathy-glib')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra')
-install=gnome-panel.install
-groups=('gnome')
-replaces=('gnome-panel-bonobo')
-provides=("gnome-panel-bonobo=${pkgver}")
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2
-        fix-crasher-launchers.patch)
-sha256sums=('2014225215afc8a8a4363481c26f9a9443d3dfc944aa7bcb0c5224f723c0b98b'
-            '6724690bb2943f50ab296af6f1e1a7c10a91415ba150586b5623f20cc214ace0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-crasher-launchers.patch"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-panel \
-      --disable-scrollkeeper \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-panel-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-panel/fix-crasher-launchers.patch b/testing/gnome-panel/fix-crasher-launchers.patch
deleted file mode 100644
index b15fdf29c..000000000
--- a/testing/gnome-panel/fix-crasher-launchers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8c275a2adf4ad99297a17cabf251344837620831 Mon Sep 17 00:00:00 2001
-From: Josselin Mouette <joss@malsain.org>
-Date: Mon, 11 Apr 2011 13:05:32 +0000
-Subject: panel: Fix crash when starting launcher
-
-Do not destroy a widget in its draw signal. This is bad. Really.
-
-This was happening in the animation that is being drawn after clicking a
-launcher.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=641325
----
-diff --git a/gnome-panel/xstuff.c b/gnome-panel/xstuff.c
-index 8465341..5acbf66 100644
---- a/gnome-panel/xstuff.c
-+++ b/gnome-panel/xstuff.c
-@@ -305,6 +305,14 @@ zoom_timeout (GtkWidget *window)
- }
- 
- static gboolean
-+idle_destroy (gpointer data)
-+{
-+	gtk_widget_destroy (GTK_WIDGET (data));
-+
-+	return FALSE;
-+}
-+
-+static gboolean
- zoom_draw (GtkWidget *widget,
- 	   cairo_t   *cr,
-            gpointer    user_data)
-@@ -323,7 +331,7 @@ zoom_draw (GtkWidget *widget,
- 
- 		g_slice_free (CompositedZoomData, zoom);
- 
--		gtk_widget_destroy (widget);
-+		g_idle_add (idle_destroy, widget);
- 	} else {
- 		GdkPixbuf *scaled;
- 		int width, height;
---
-cgit v0.9
diff --git a/testing/gnome-panel/gnome-panel.install b/testing/gnome-panel/gnome-panel.install
deleted file mode 100644
index e3175df5e..000000000
--- a/testing/gnome-panel/gnome-panel.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gnome-panel
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gnome-pilot/PKGBUILD b/testing/gnome-pilot/PKGBUILD
deleted file mode 100644
index f2751adfa..000000000
--- a/testing/gnome-pilot/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 116045 2011-03-22 16:53:46Z heftig $
-# Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-pilot
-pkgver=2.91.92
-pkgrel=1
-pkgdesc="Pilot Support for Gnome"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('pilot-link' 'evolution-data-server')
-makedepends=('intltool' 'gob2' 'gnome-doc-utils' 'gnome-panel')
-optdepends=('gnome-panel')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gnome-pilot.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('dc7a166c95580c2935b1cab822d9e6d63d5ef08bb19eacf4a84f6eda071f07c3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-pilot \
-      --localstatedir=/var --disable-static \
-      --without-hal
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-pilot/gnome-pilot.install b/testing/gnome-pilot/gnome-pilot.install
deleted file mode 100644
index 616daa0e4..000000000
--- a/testing/gnome-pilot/gnome-pilot.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-pilot
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/gnome-power-manager/PKGBUILD b/testing/gnome-power-manager/PKGBUILD
deleted file mode 100644
index c9161e142..000000000
--- a/testing/gnome-power-manager/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 117756 2011-04-04 17:41:50Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-power-manager
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Session daemon that makes it easy to manage your laptop or desktop system."
-arch=(i686 x86_64 'mips64el')
-url="http://www.gnome.org/projects/gnome-power-manager/"
-license=('GPL')
-depends=('libnotify' 'gconf' 'libcanberra' 'gnome-icon-theme' 'upower'
-         'libgnome-keyring' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-control-center')
-options=(!emptydirs)
-install=gnome-power-manager.install
-groups=(gnome-extra)
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('20d8c147a50eef534e81edb033648e5e9cf7a3f733e80c5d6c946b571f7ae4e1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-power-manager \
-      --disable-scrollkeeper \
-      --with-dbus-services=/usr/share/dbus-1/services \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-power-manager/gnome-power-manager.install b/testing/gnome-power-manager/gnome-power-manager.install
deleted file mode 100644
index 4666938db..000000000
--- a/testing/gnome-power-manager/gnome-power-manager.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.91.92) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-power-manager
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-screensaver/PKGBUILD b/testing/gnome-screensaver/PKGBUILD
deleted file mode 100644
index 4b2da8732..000000000
--- a/testing/gnome-screensaver/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 117764 2011-04-04 17:44:42Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-screensaver
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://live.gnome.org/GnomeScreensaver"
-backup=(etc/pam.d/gnome-screensaver)
-depends=('dbus-glib' 'gnome-menus' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas')
-makedepends=('pkgconfig' 'intltool' 'libxss')
-optdepends=('xscreensaver')
-groups=('gnome')
-options=(!emptydirs)
-install=gnome-screensaver.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-       gnome-screensaver.pam)
-sha256sums=('e00e801d94c1d9f1e62049f77b91d822047eb1dcbd2e01cc38b5dd1b0f67c948'
-            '2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-screensaver \
-      --localstatedir=/var \
-      --with-mit-ext
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 "${srcdir}/gnome-screensaver.pam" "${pkgdir}/etc/pam.d/gnome-screensaver"
-}
diff --git a/testing/gnome-screensaver/gnome-screensaver.install b/testing/gnome-screensaver/gnome-screensaver.install
deleted file mode 100644
index 3b0e06046..000000000
--- a/testing/gnome-screensaver/gnome-screensaver.install
+++ /dev/null
@@ -1,7 +0,0 @@
-pkgname=gnome-screensaver
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        usr/sbin/gconfpkg --uninstall ${pkgname}
-    fi
-}
diff --git a/testing/gnome-screensaver/gnome-screensaver.pam b/testing/gnome-screensaver/gnome-screensaver.pam
deleted file mode 100644
index c776a5410..000000000
--- a/testing/gnome-screensaver/gnome-screensaver.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth        required     pam_unix_auth.so
-auth        optional     pam_gnome_keyring.so
diff --git a/testing/gnome-session/PKGBUILD b/testing/gnome-session/PKGBUILD
deleted file mode 100644
index 14916a6dd..000000000
--- a/testing/gnome-session/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 120864 2011-04-26 21:44:03Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-session
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="The GNOME Session Handler"
-arch=(i686 x86_64 'mips64el')
-license=('GPL' 'LGPL')
-depends=('upower' 'gtk3' 'gconf' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl' 'librsvg'
-         'gsettings-desktop-schemas' 'consolekit' 'libsm' 'dconf')
-makedepends=('intltool' 'mesa' 'xtrans')
-options=('!emptydirs')
-install=gnome-session.install
-url="http://www.gnome.org"
-groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8a553569d500e84e5815e5b0b2eb1ac1bf4064ef9afb0e16f28d948978efbd25')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-session/gnome-session.install b/testing/gnome-session/gnome-session.install
deleted file mode 100644
index 74cf4ed22..000000000
--- a/testing/gnome-session/gnome-session.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.91.91.3-3) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-session
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-settings-daemon/PKGBUILD b/testing/gnome-settings-daemon/PKGBUILD
deleted file mode 100644
index 9658f40a3..000000000
--- a/testing/gnome-settings-daemon/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 120747 2011-04-26 10:46:20Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-settings-daemon
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="The GNOME Settings daemon"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme'
-         'libcanberra' 'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf'
-         'pulseaudio' 'pulseaudio-alsa')
-makedepends=('intltool' 'gtk-doc')
-options=('!emptydirs' '!libtool')
-install=gnome-settings-daemon.install
-url="http://www.gnome.org"
-groups=('gnome')
-replaces=(gnome-settings-daemon-pulse)
-conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('51cdd0842b907e95c79d4e2b26f554e26fc626f7c2e6c3a14e3fc7954ca91117')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/bin --disable-static --enable-pulse
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-settings-daemon/gnome-settings-daemon.install b/testing/gnome-settings-daemon/gnome-settings-daemon.install
deleted file mode 100644
index 483fb9450..000000000
--- a/testing/gnome-settings-daemon/gnome-settings-daemon.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-settings-daemon
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-sharp/PKGBUILD b/testing/gnome-sharp/PKGBUILD
deleted file mode 100644
index 662f3e476..000000000
--- a/testing/gnome-sharp/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 119246 2011-04-11 14:46:11Z jgc $
-# Maintainer: tobias <tobias@archlinux.org>
-
-pkgbase=gnome-sharp
-pkgname=('gnome-sharp' 'art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp')
-pkgver=2.24.2
-pkgrel=1
-arch=(i686 x86_64 'mips64el')
-license=(LGPL)
-url="http://gtk-sharp.sourceforge.net"
-makedepends=('gtk-sharp-2' 'libgnomeui' 'monodoc')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('3b38f53960c736d4afb8f04204efe98b')
-
-build() {
-  # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR="${srcdir}/weird"
-  mkdir -p "${MONO_SHARED_DIR}"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package_gnome-sharp() {
-  pkgdesc="GNOME bindings for C#"
-  depends=('art-sharp' 'gconf-sharp' 'gconf-sharp-peditors' 'libgnome-sharp' 'gnome-vfs-sharp')
-}
-
-package_art-sharp() {
-  pkgdesc="Mono bindings for libart"
-  depends=('gtk-sharp-2' 'libart-lgpl')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C art install DESTDIR="${pkgdir}"
-}
-
-package_gconf-sharp() {
-  pkgdesc="Mono bindings for GConf"
-  depends=('gtk-sharp-2' 'gconf')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gconf/GConf install DESTDIR="${pkgdir}"
-  make -C gconf/tools install DESTDIR="${pkgdir}"
-}
-
-package_gconf-sharp-peditors() {
-  pkgdesc="Mono bindings for GConf - Property Editing classes"
-  depends=('gconf-sharp' 'libgnome-sharp')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gconf/GConf.PropertyEditors install DESTDIR="${pkgdir}"
-}
-
-package_libgnome-sharp() {
-  pkgdesc="Mono bindings for libgnome"
-  depends=('art-sharp' 'gnome-vfs-sharp' 'libgnomeui')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnome install DESTDIR="${pkgdir}"
-}
-
-package_gnome-vfs-sharp() {
-  pkgdesc="Mono bindings for GNOME-VFS"
-  depends=('gtk-sharp-2' 'gnome-vfs')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomevfs install DESTDIR="${pkgdir}"
-}
diff --git a/testing/gnome-shell/PKGBUILD b/testing/gnome-shell/PKGBUILD
deleted file mode 100644
index 605c38fc8..000000000
--- a/testing/gnome-shell/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 120693 2011-04-25 23:29:13Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Flamelab <panosfilip@gmail.com
-
-pkgname=gnome-shell
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="The next generation GNOME Shell"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://live.gnome.org/GnomeShell"
-license=('GPL2')
-depends=('mutter' 'gconf' 'dconf' 'gjs' 'gnome-menus' 'gnome-desktop' 'libcroco' 'libcanberra' 'libpulse' 'telepathy-glib' 'polkit-gnome'
-         'gobject-introspection' 'evolution-data-server' 'gnome-bluetooth' 'gstreamer0.10' 'telepathy-logger')
-makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('network-manager-applet: shell integration for networkmanager'
-            'gnome-power-manager: shell integration for power management')
-options=('!libtool' '!emptydirs')
-install=gnome-shell.install
-groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
-        arch.patch)
-sha256sums=('01f7ae942ba9687a5e67d62423843ed404d77b35f74acc212a5f391beed8e079'
-            'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/arch.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-shell \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-shell ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-shell/arch.patch b/testing/gnome-shell/arch.patch
deleted file mode 100644
index 67baefdcb..000000000
--- a/testing/gnome-shell/arch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gnome-shell.orig/data/org.gnome.shell.gschema.xml.in gnome-shell/data/org.gnome.shell.gschema.xml.in
---- gnome-shell.orig/data/org.gnome.shell.gschema.xml.in	2011-04-06 08:47:58.638600793 -0700
-+++ gnome-shell/data/org.gnome.shell.gschema.xml.in	2011-04-06 08:49:17.035274675 -0700
-@@ -30,7 +30,7 @@
-       </_description>
-     </key>
-     <key name="favorite-apps" type="as">
--      <default>[ 'mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop' ]</default>
-+      <default>[ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'writer.desktop', 'nautilus.desktop' ]</default>
-       <_summary>List of desktop file IDs for favorite applications</_summary>
-       <_description>
-         The applications corresponding to these identifiers
diff --git a/testing/gnome-shell/gnome-shell.install b/testing/gnome-shell/gnome-shell.install
deleted file mode 100644
index a07105c24..000000000
--- a/testing/gnome-shell/gnome-shell.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gnome-shell
-
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/gnome-system-monitor/PKGBUILD b/testing/gnome-system-monitor/PKGBUILD
deleted file mode 100644
index b383bb180..000000000
--- a/testing/gnome-system-monitor/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 117833 2011-04-04 18:12:02Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-system-monitor
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="A system monitor for GNOME"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme')
-makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool')
-options=(!emptydirs)
-url="http://www.gnome.org"
-groups=('gnome-extra')
-install=gnome-system-monitor.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8d4b695ec165645c3d070f3296dc25cea4e3f1f4da7b4afa10ff1c166cc62d24')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-system-monitor/gnome-system-monitor.install b/testing/gnome-system-monitor/gnome-system-monitor.install
deleted file mode 100644
index e2957a570..000000000
--- a/testing/gnome-system-monitor/gnome-system-monitor.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gnome-system-monitor
-
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        usr/sbin/gconfpkg --uninstall ${pkgname}
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/gnome-terminal/PKGBUILD b/testing/gnome-terminal/PKGBUILD
deleted file mode 100644
index 06bb43fac..000000000
--- a/testing/gnome-terminal/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 120609 2011-04-25 18:07:09Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-terminal
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="The GNOME Terminal Emulator"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm')
-makedepends=('gnome-doc-utils' 'gtk2' 'intltool')
-#gtk2 is needed for gtk-builder-convert
-#https://bugzilla.gnome.org/show_bug.cgi?id=588945
-#https://bugzilla.gnome.org/show_bug.cgi?id=588732
-options=('!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-terminal.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('388eda40663566cb785e2d92180e0b584c2c89acc3e7bcd30605601710fddc48')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper \
-      --with-gtk=3.0
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-terminal ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-terminal/gnome-terminal.install b/testing/gnome-terminal/gnome-terminal.install
deleted file mode 100644
index 04c2b3c2c..000000000
--- a/testing/gnome-terminal/gnome-terminal.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-terminal
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/gnome-themes-standard/PKGBUILD b/testing/gnome-themes-standard/PKGBUILD
deleted file mode 100644
index 366bdadfc..000000000
--- a/testing/gnome-themes-standard/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 120589 2011-04-25 17:43:37Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-pkgname=gnome-themes-standard
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="Default themes for the GNOME desktop"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://abattis.org/cantarell/"
-license=('GPL2')
-depends=('cantarell-fonts' 'gtk3' 'gtk-engines')
-makedepends=('intltool')
-groups=('gnome')
-replaces=('gnome-themes')
-conflicts=('gnome-themes')
-source=(http://download.gnome.org/sources/$pkgname/3.0/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('9630b12c02d8a05a328cb0bef111bb776b86639c9c582475943f71666ab82677')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-user-share/PKGBUILD b/testing/gnome-user-share/PKGBUILD
deleted file mode 100644
index 82c43da59..000000000
--- a/testing/gnome-user-share/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 117703 2011-04-04 16:40:52Z ibiru $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-user-share
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Easy to use user-level file sharing for GNOME."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
-license=('GPL')
-depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra')
-makedepends=('intltool' 'gnome-doc-utils' 'nautilus')
-options=('!emptydirs' '!libtool')
-install=gnome-user-share.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1987d08ebb88bd3fecd7c76d2d9549dba2c7132a7c2b3cfe68fdc2a24260fafe')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-user-share \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain gnome-user-share ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-user-share/gnome-user-share.install b/testing/gnome-user-share/gnome-user-share.install
deleted file mode 100644
index 3cc1b5286..000000000
--- a/testing/gnome-user-share/gnome-user-share.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gnome-user-share
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gnome-utils/PKGBUILD b/testing/gnome-utils/PKGBUILD
deleted file mode 100644
index bf6b99380..000000000
--- a/testing/gnome-utils/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-#  $Id: PKGBUILD 120619 2011-04-25 18:27:58Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-utils
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="Common utilities for GNOME"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('libgtop' 'libcanberra' 'libsm' 'gconf' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('gnome-doc-utils' 'pkgconfig' 'intltool')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome-extra')
-install=gnome-utils.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7debe9ca4ba8b8852f67c1a359c613dbfa10e10abfaa2235261cbc2520daf218')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --libexecdir=/usr/lib/gnome-utils \
-        --localstatedir=/var --disable-static \
-        --disable-scrollkeeper \
-        --disable-schemas-compile \
-        --disable-schemas-install
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-utils-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
-  # remove it also from Xfce menu that ships its own thingy
-  sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-dictionary.desktop
-  sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-screenshot.desktop
-}
diff --git a/testing/gnome-utils/gnome-utils.install b/testing/gnome-utils/gnome-utils.install
deleted file mode 100644
index a04bda405..000000000
--- a/testing/gnome-utils/gnome-utils.install
+++ /dev/null
@@ -1,26 +0,0 @@
-pkgname=gnome-utils
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
diff --git a/testing/gnome-vfs/PKGBUILD b/testing/gnome-vfs/PKGBUILD
deleted file mode 100644
index 39abc3f5e..000000000
--- a/testing/gnome-vfs/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 119776 2011-04-15 07:50:36Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-vfs
-pkgver=2.24.4
-pkgrel=2
-pkgdesc="The GNOME Virtual File System"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('fam' 'gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'heimdal' 'gnutls')
-makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
-options=('!libtool' '!emptydirs' '!makeflags')
-conflicts=(gnome-vfs-samba)
-provides=(gnome-vfs-samba)
-replaces=(gnome-vfs-samba gnome-vfs-extras)
-url="http://www.gnome.org"
-install=gnome-vfs.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2
-        gnutls-config.patch)
-sha256sums=('62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa'
-            '66c7cfb12995c0dd94a2caea95c7e3c55981993f05a79c585d60915ff131955d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  #Fix build with new gnutls
-  patch -Np1 -i "${srcdir}/gnutls-config.patch"
-  libtoolize --force
-  gtkdocize
-  aclocal
-  autoconf
-  automake
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-vfs-2.0 \
-      --enable-samba --disable-hal \
-      --enable-avahi --disable-howl \
-      --disable-openssl --enable-gnutls
-  make
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -d -m755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-vfs-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-vfs/gnome-vfs.install b/testing/gnome-vfs/gnome-vfs.install
deleted file mode 100644
index 793a3e7ab..000000000
--- a/testing/gnome-vfs/gnome-vfs.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-vfs
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/gnome-vfs/gnutls-config.patch b/testing/gnome-vfs/gnutls-config.patch
deleted file mode 100644
index f6fa18b17..000000000
--- a/testing/gnome-vfs/gnutls-config.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-# Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0
-# Use pkg-config in place of gnutls own macro since it's not present anymore.
---- a/configure.in	2009-03-07 19:59:53.805507753 +0100
-+++ b/configure.in	2009-03-07 18:34:36.928169018 +0100
-@@ -686,14 +686,14 @@
-     AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***])
-   else
-     AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***]))
--    AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
--			      have_ssl=true])
-+    PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-+    				 	   	  have_ssl=true])
- 
-     if test "x${LIBGNUTLS_LIBS}" = "x"; then
--      AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
--                                 AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
--				 have_ssl=true],
--                                 AC_MSG_ERROR([Unable to find GNUTLS]))
-+      PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-+      				   	     	    AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
-+						    have_ssl=true],
-+						    AC_MSG_ERROR([Unable to find GNUTLS]))
-     fi
-   fi
- fi
diff --git a/testing/gobject-introspection/PKGBUILD b/testing/gobject-introspection/PKGBUILD
deleted file mode 100644
index a3471ac2c..000000000
--- a/testing/gobject-introspection/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 120263 2011-04-21 19:51:52Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=gobject-introspection
-pkgver=0.10.8
-pkgrel=1
-pkgdesc="Introspection system for GObject-based libraries"
-url="http://live.gnome.org/GObjectInstrospection"
-arch=('x86_64' 'i686' 'mips64el')
-license=('LGPL' 'GPL')
-depends=('libffi' 'glib2' 'python2')
-makedepends=('cairo')
-conflicts=('gir-repository')
-replaces=('gir-repository')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.10/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('5b1387ff37f03db880a2b1cbd6c6b6dfb923a29468d4d8367c458abf7704c61e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  sed -i '1s|#!/usr/bin/env python$|&2|' \
-    "${pkgdir}"/usr/lib/gobject-introspection/giscanner/*.py
-}
diff --git a/testing/gthumb/PKGBUILD b/testing/gthumb/PKGBUILD
deleted file mode 100644
index 22b63c6ba..000000000
--- a/testing/gthumb/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 113327 2011-03-08 12:34:07Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gthumb
-pkgver=2.13.1
-pkgrel=1
-pkgdesc="Image browser and viewer for the GNOME Desktop"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-url="http://gthumb.sourceforge.net/"
-depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2')
-makedepends=('intltool' 'gnome-doc-utils' 'libsm' 'gstreamer0.10-base' 'brasero')
-optdepends=('gstreamer0.10-base: video support')
-options=('!libtool' '!emptydirs')
-install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3b124e1b3ae5a3496d9392c11052792e5168535b849756b53cefd9d7b1e8e7b9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-libbrasero
-  make V=1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gthumb "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gthumb/gthumb.install b/testing/gthumb/gthumb.install
deleted file mode 100644
index 6046ebb6f..000000000
--- a/testing/gthumb/gthumb.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gthumb
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gtk-vnc/PKGBUILD b/testing/gtk-vnc/PKGBUILD
deleted file mode 100644
index a7e0372fb..000000000
--- a/testing/gtk-vnc/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 110311 2011-02-18 20:01:10Z heftig $
-# Maintainer:
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Allan McRae <mcrae_allan@hotmail.com>
-# Contributor: lp76 <l.peduto@gmail.com>
-
-pkgname=gtk-vnc
-pkgver=0.4.3
-pkgrel=1
-pkgdesc="A VNC viewer widget for GTK"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://live.gnome.org/gtk-vnc"
-license=('LGPL')
-depends=('gtk3')
-optdepends=('gtk2: GTK2 widget')
-makedepends=('intltool' 'pygtk' 'pygobject-devel' 'gtk-doc' 'gtk2')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377')
-
-build() {
-  cd "$srcdir"
-  cp -a $pkgname-$pkgver gtk3-build
-
-  ( cd $pkgname-$pkgver
-    PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --with-python --disable-static --with-gtk=2.0
-    make )
-
-  ( cd gtk3-build
-    PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --with-python --with-examples --disable-static --with-gtk=3.0
-    make )
-}
-
-package() {
-  cd "${srcdir}"
-  make -C $pkgname-$pkgver -j1 DESTDIR="${pkgdir}" install
-  make -C gtk3-build -j1 DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtk2/PKGBUILD b/testing/gtk2/PKGBUILD
deleted file mode 100644
index 5fcc6a520..000000000
--- a/testing/gtk2/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 117444 2011-04-02 06:12:32Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gtk2
-pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.4
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gtk.org/"
-makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'heimdal' 'gnutls'
-             'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection')
-options=('!libtool' '!docs')
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.bz2
-        xid-collision-debug.patch)
-sha256sums=('7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
-
-build() {
-    cd "${srcdir}/gtk+-${pkgver}"
-    patch -Np1 -i "${srcdir}/xid-collision-debug.patch"
-
-    CXX=/bin/false ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --with-xinput=yes
-    make
-}
-package_gtk2() {
-    pkgdesc="The GTK+ Toolkit (v2)"
-    install=gtk2.install
-    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'heimdal' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
-    backup=(etc/gtk-2.0/gtkrc)
-
-    cd "${srcdir}/gtk+-${pkgver}"
-
-    make DESTDIR="${pkgdir}" install
-    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
-    echo 'gtk-fallback-icon-theme = "gnome"' > "${pkgdir}/etc/gtk-2.0/gtkrc"
-    #split this out to use with gtk3 too
-    rm ${pkgdir}/usr/bin/gtk-update-icon-cache
-}
-package_gtk-update-icon-cache() {
-    pkgdesc="The GTK+ update icon cache tool"
-    depends=('gdk-pixbuf2')
-
-    cd "${srcdir}/gtk+-${pkgver}/gtk"
-
-    install -D -m755 gtk-update-icon-cache ${pkgdir}/usr/bin/gtk-update-icon-cache
-}
diff --git a/testing/gtk2/gtk2.install b/testing/gtk2/gtk2.install
deleted file mode 100644
index 4e2b72f1b..000000000
--- a/testing/gtk2/gtk2.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  rm -f etc/gtk-2.0/gtk.immodules &>/dev/null
-  rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
-}
diff --git a/testing/gtk2/xid-collision-debug.patch b/testing/gtk2/xid-collision-debug.patch
deleted file mode 100644
index d61238c3b..000000000
--- a/testing/gtk2/xid-collision-debug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gtk+-2.18.3/gdk/x11/gdkxid.c	2009-06-19 04:59:18.000000000 +0200
-+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new	2009-07-22 11:30:12.000000000 +0200
-@@ -56,10 +56,10 @@
-   if (!display_x11->xid_ht)
-     display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
- 					    (GEqualFunc) gdk_xid_equal);
--
-+/*
-   if (g_hash_table_lookup (display_x11->xid_ht, xid))
-     g_warning ("XID collision, trouble ahead");
--
-+*/
-   g_hash_table_insert (display_x11->xid_ht, xid, data);
- }
- 
diff --git a/testing/gtk3/PKGBUILD b/testing/gtk3/PKGBUILD
deleted file mode 100644
index 485b2929e..000000000
--- a/testing/gtk3/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 119847 2011-04-15 22:42:57Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtk3
-pkgver=3.0.9
-pkgrel=1
-pkgdesc="The GTK+ Toolkit (v3)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gtk.org/"
-install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'gnutls' 'heimdal' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info')
-makedepends=('gobject-introspection')
-options=('!libtool' '!docs')
-backup=(etc/gtk-3.0/settings.ini)
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.0/gtk+-${pkgver}.tar.bz2
-        settings.ini)
-sha256sums=('88a9dda6f2a23155ac3d7aca6b414ca3b55e2817b46bcc87733f1a407e16678c'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
-
-build() {
-    cd "${srcdir}/gtk+-${pkgver}"
-    CXX=/bin/false ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --enable-gtk2-dependency \
-        --disable-schemas-compile
-    make
-}
-
-package() {
-    cd "${srcdir}/gtk+-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-
-    install -Dm644 "${srcdir}/settings.ini" "${pkgdir}/etc/gtk-3.0/settings.ini"
-}
diff --git a/testing/gtk3/gtk3.install b/testing/gtk3/gtk3.install
deleted file mode 100644
index cd8965d1f..000000000
--- a/testing/gtk3/gtk3.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-    usr/bin/gtk-query-immodules-3.0 --update-cache
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
-post_remove() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/gtk3/settings.ini b/testing/gtk3/settings.ini
deleted file mode 100644
index 039000d38..000000000
--- a/testing/gtk3/settings.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Settings]
-gtk-fallback-icon-theme = gnome
diff --git a/testing/gtkhtml4/PKGBUILD b/testing/gtkhtml4/PKGBUILD
deleted file mode 100644
index f66541e44..000000000
--- a/testing/gtkhtml4/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 120569 2011-04-25 17:16:30Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtkhtml4
-_pkgbasename=gtkhtml
-pkgver=4.0.1
-pkgrel=1
-pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('gconf' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup')
-makedepends=('intltool')
-url="http://www.gnome.org"
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2)
-sha256sums=('13fd845ce2ebc837fd4771d2dd0c103bde20faad9f77f6c7a62ff7d8099557ff')
-
-build() {
-    cd "${srcdir}/${_pkgbasename}-${pkgver}"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --libexecdir=/usr/lib/gtkhtml4 \
-        --localstatedir=/var --disable-static
-    make
-}
-
-package() {
-    cd "${srcdir}/${_pkgbasename}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtkmm/PKGBUILD b/testing/gtkmm/PKGBUILD
deleted file mode 100644
index babd7c197..000000000
--- a/testing/gtkmm/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 109786 2011-02-12 18:59:28Z ibiru $
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gtkmm
-pkgname=('gtkmm' 'gtkmm-docs')
-pkgver=2.24.0
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-url="http://gtkmm.sourceforge.net/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('8cbae7254746bc7df7cce882d9b9a916c4e00dba7bdacd1c50b5d096a484cf56')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package_gtkmm() {
-  pkgdesc="C++ bindings for gtk2"
-  depends=('gtk2' 'pangomm' 'atkmm')
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gtkmm-docs() {
-  pkgdesc="Developer documentation for gtkmm v2"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C docs DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtkmm3/PKGBUILD b/testing/gtkmm3/PKGBUILD
deleted file mode 100644
index bad258c88..000000000
--- a/testing/gtkmm3/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 118358 2011-04-06 12:31:04Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=gtkmm3
-_pkgbasename=gtkmm
-pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.0.0
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-url="http://gtkmm.sourceforge.net/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${_pkgbasename}/3.0/${_pkgbasename}-${pkgver}.tar.bz2)
-sha256sums=('567582948d4c47c29aa751162adc714644f50958d3d3e427c7a8c3818cd643f9')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package_gtkmm3() {
-  pkgdesc="C++ bindings for gtk3"
-  depends=('gtk3' 'pangomm' 'atkmm')
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gtkmm3-docs() {
-  pkgdesc="Developer documentation for gtkmm v3"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make -C docs DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtksourceview3/PKGBUILD b/testing/gtksourceview3/PKGBUILD
deleted file mode 100644
index 58b9e0500..000000000
--- a/testing/gtksourceview3/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 120698 2011-04-25 23:34:40Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtksourceview3
-_pkgbasename=gtksourceview
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="A text widget adding syntax highlighting and more to GNOME"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gtk3' 'libxml2')
-makedepends=('intltool' 'pkgconfig' 'gobject-introspection')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.bz2)
-sha256sums=('4e76f037184d56767e09df909490f10ee417a5265febae8a4d23255a902ae20a')
-
-build() {
-  cd "${srcdir}/$_pkgbasename-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/$_pkgbasename-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gucharmap/PKGBUILD b/testing/gucharmap/PKGBUILD
deleted file mode 100644
index 36882078c..000000000
--- a/testing/gucharmap/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 120594 2011-04-25 17:46:45Z ibiru $
-# Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=gucharmap
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="Gnome Unicode Charmap"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.gnome.org"
-depends=('gconf' 'hicolor-icon-theme')
-makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-install=gucharmap.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('948a376f13af98ffe6be29c73f1d89d2dbc201abd697bb6e85c717d8242dcf75')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-scrollkeeper --with-gtk=3.0 \
-      --enable-introspection
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gucharmap ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gucharmap/gucharmap.install b/testing/gucharmap/gucharmap.install
deleted file mode 100644
index 4de3253f6..000000000
--- a/testing/gucharmap/gucharmap.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gucharmap
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD
deleted file mode 100644
index 40322ce77..000000000
--- a/testing/gvfs/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# $Id: PKGBUILD 120775 2011-04-26 14:51:23Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.8.1
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2'
-             'libarchive' 'gnome-disk-utility' 'pkgconfig' 'intltool'
-             'libimobiledevice')
-url="http://www.gnome.org"
-options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('7d305320d881d914d88286a72a311587ea33fbe5075101729cb5766f01832ff7')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gvfs \
-      --with-bash-completion-dir=/etc/bash_completion.d
-  make
-}
-
-package_gvfs() {
-  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('libsoup-gnome' 'gnome-disk-utility' 'libcdio' 'fuse' 'libarchive')
-  optdepends=('gvfs-afc: AFC (mobile devices) support'
-              'gvfs-smb: SMB/CIFS (Windows client) support'
-              'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
-              'gvfs-obexftp: ObexFTP (bluetooth) support')
-  install=gvfs.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -e 's/^am__append_3/#am__append_3/' \
-      -e 's/^am__append_4/#am__append_4/' \
-      -i monitor/Makefile
-  make DESTDIR="${pkgdir}" install
-
-  cd "${pkgdir}"
-  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,gphoto2,obexftp}
-  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,gphoto2,obexftp}.mount
-  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
-  rm usr/share/GConf/gsettings/gvfs-smb.convert
-}
-
-package_gvfs-smb() {
-  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring')
-  install=gvfs-smb.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -m755 -d "${pkgdir}/usr/lib/gvfs"
-  install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
-
-  install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/"
-  install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
-
-  install -Dm644 org.gnome.system.smb.gschema.xml \
-    "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
-  install -Dm644 gvfs-smb.convert \
-    "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert"
-}
-
-package_gvfs-afc() {
-  pkgdesc="AFC (mobile devices) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'libimobiledevice')
-  install=gvfs-module.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc"
-  install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gvfs-gphoto2() {
-  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev')
-  install=gvfs-module.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2"
-  install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gvfs-obexftp() {
-  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server')
-  install=gvfs-module.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp"
-  install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount"
-}
diff --git a/testing/gvfs/gvfs-module.install b/testing/gvfs/gvfs-module.install
deleted file mode 100644
index 09d1f11ec..000000000
--- a/testing/gvfs/gvfs-module.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/testing/gvfs/gvfs-smb.install b/testing/gvfs/gvfs-smb.install
deleted file mode 100644
index 0b8783c7b..000000000
--- a/testing/gvfs/gvfs-smb.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/gvfs/gvfs.install b/testing/gvfs/gvfs.install
deleted file mode 100644
index 9458b1513..000000000
--- a/testing/gvfs/gvfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  usr/bin/gio-querymodules usr/lib/gio/modules
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  usr/bin/gio-querymodules usr/lib/gio/modules
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/kdeplasma-applets-networkmanagement/PKGBUILD b/testing/kdeplasma-applets-networkmanagement/PKGBUILD
deleted file mode 100644
index e59512436..000000000
--- a/testing/kdeplasma-applets-networkmanagement/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 105813 2011-01-12 00:25:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
-
-pkgname=kdeplasma-applets-networkmanagement
-pkgver=git20110418
-_commit=545967db075ed65b0452def93e1c1588190cdc9a
-pkgrel=2
-pkgdesc="KDE control panel and widget network connections"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.kde.org/"
-license=('GPL')
-depends=('kdebase-workspace' 'networkmanager')
-makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info')
-optdepends=('mobile-broadband-provider-info: allow to add new mobile connection')
-install=${pkgname}.install
-source=("${pkgname}-${pkgver}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}")
-md5sums=('d7f50b4b6917d39c79332b868ad2d0cf')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../networkmanagement \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install b/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/kismet/PKGBUILD b/testing/kismet/PKGBUILD
deleted file mode 100644
index 4c8f9ee0d..000000000
--- a/testing/kismet/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 119587 2011-04-12 15:18:27Z angvp $
-# Contributer: Jason Chu <jason@archlinux.org>
-# Maintainer: Juergen Hoetzel <jason@archlinux.org>
-
-pkgname=kismet
-pkgver=2011_03_R2
-_realver="${pkgver//_/-}"
-pkgrel=1
-pkgdesc="802.11b sniffing software"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('gmp' 'imagemagick' 'libpcap>=1.0.0' 'ncurses' 'dbus' 'libjpeg>=7')
-optdepends=(perl-libwww)
-url="http://www.kismetwireless.net/"
-backup=('etc/kismet.conf' 'etc/kismet_drone.conf')
-options=('!makeflags')
-source=(http://www.kismetwireless.net/code/kismet-${pkgver//_/-}.tar.gz)
-md5sums=('8bf077e8111e6dc8c12cadefdf40aadd')
-
-build() {
-   cd "$srcdir/kismet-$_realver"
-
-   ./configure --prefix=/usr \
-               --sysconfdir=/etc \
-               --localstatedir=/var 
-
-   make dep
-   make 
-   sed -i 's/prism2/wlanng/g' conf/kismet.conf
-   make DESTDIR="$pkgdir" install
-
-   chown root:root "$pkgdir"/usr/share/man/man{1,5}/*
-
-   install -D -m 644 "$srcdir/kismet-$_realver/README" "$pkgdir/usr/share/kismet/README"
-
-   # Fix the *.conf unexpanded ${prefix} problems
-   sed -i 's%\${prefix}%/usr%' "$pkgdir"/etc/*.conf 
-}
diff --git a/testing/kismet/kismet-2008-05-R1-infinite-loop.diff b/testing/kismet/kismet-2008-05-R1-infinite-loop.diff
deleted file mode 100644
index f8417943e..000000000
--- a/testing/kismet/kismet-2008-05-R1-infinite-loop.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- gpsmap.cc
-+++ gpsmap.cc
-@@ -874,7 +874,7 @@
- 
-                 // Break up the path to the gpsxml file and form a path based on that
-                 unsigned int lastslash = 0;
--                for (unsigned int x = origxmlfile.find('/'); x != string::npos;
-+                for (string::size_type x = origxmlfile.find('/'); x != string::npos;
-                      lastslash = x, x = origxmlfile.find('/', lastslash+1)) {
-                     // We don't actually need to do anything...
-                 }
-@@ -882,7 +882,7 @@
-                 comp = origxmlfile.substr(0, lastslash);
- 
-                 lastslash = 0;
--                for (unsigned int x = orignetfile.find('/'); x != string::npos;
-+                for (string::size_type x = orignetfile.find('/'); x != string::npos;
-                      lastslash = x, x = orignetfile.find('/', lastslash+1)) {
-                     // We don't actually need to do anything...
-                 }
diff --git a/testing/kismet/kismet-build.patch b/testing/kismet/kismet-build.patch
deleted file mode 100644
index 9935ca4fa..000000000
--- a/testing/kismet/kismet-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- macaddr.h.orig	2009-07-08 02:29:38.000000000 -0400
-+++ macaddr.h	2009-07-08 02:37:54.000000000 -0400
-@@ -73,7 +73,7 @@
- 			longmac |= (uint64_t) bs_in[5] << ((MAC_LEN - 5 - 1) * 8);
- 
-             // If it has a mask component, get that
--            char *in_mask = strchr(in, '/');
-+            const char *in_mask = strchr(in, '/');
-             if (in_mask != NULL) {
-                 longmask = 0;
- 
diff --git a/testing/lcms2/PKGBUILD b/testing/lcms2/PKGBUILD
deleted file mode 100644
index 33ba7c9d1..000000000
--- a/testing/lcms2/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 111439 2011-02-26 20:12:41Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgname=lcms2
-pkgver=2.1
-pkgrel=1
-pkgdesc="Small-footprint color management engine, version 2"
-arch=(i686 x86_64 'mips64el')
-license=('custom')
-depends=('libtiff>=3.9.4')
-url="http://www.littlecms.com"
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/lcms/$pkgname-$pkgver.tar.gz)
-md5sums=('08036edb115ad74456dfa20b1998b5f4')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm 644 COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/testing/libcanberra/PKGBUILD b/testing/libcanberra/PKGBUILD
deleted file mode 100644
index f5052b769..000000000
--- a/testing/libcanberra/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 109949 2011-02-14 08:47:45Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libcanberra
-pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
-pkgver=0.26
-pkgrel=5
-pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL')
-depends=('libvorbis' 'libtool' 'alsa-lib' 'tdb')
-makedepends=('gtk-doc' 'libpulse' 'gstreamer0.10' 'gtk2' 'gtk3')
-options=(!emptydirs)
-url=http://0pointer.de/lennart/projects/libcanberra
-source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
-        libcanberra-gtk-module.sh libcanberra-quit-add.patch)
-md5sums=('ee2c66ada7c851a4e7b6eb1682285a24'
-         'a54799e624aac814b9343ab05f25c38b'
-         'a147bce8a7addcd40b21faaaf028819b')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  patch -Np1 -i "${srcdir}/libcanberra-quit-add.patch"
-  ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
-      --disable-static --with-builtin=dso --enable-null --disable-oss \
-      --enable-alsa --enable-gstreamer --enable-pulse
-  make
-}
-
-package_libcanberra() {
-  install=libcanberra.install
-  optdepends=("$pkgbase-pulse: PulseAudio driver"
-              "$pkgbase-gstreamer: GStreamer driver")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -j1 DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la
-  rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la
-  
-  install -m755 -d "${pkgdir}/usr/share/gconf" 
-  mv "${pkgdir}/etc/gconf/schemas" "${pkgdir}/usr/share/gconf/"
-
-  install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d"
-  install -m755 "${srcdir}/libcanberra-gtk-module.sh" "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
-
-  # Split plugins
-  for _p in pulse gstreamer; do
-    mkdir $_p-plugin
-    mv "${pkgdir}"/usr/lib/${pkgbase}-${pkgver}/${pkgbase}-$_p.* $_p-plugin
-  done
-}
-
-package_libcanberra-pulse() {
-  pkgdesc="PulseAudio plugin for libcanberra"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'libpulse')
-  groups=('pulseaudio-gnome')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
-  mv pulse-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
-}
-
-package_libcanberra-gstreamer() {
-  pkgdesc="GStreamer plugin for libcanberra"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'gstreamer0.10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
-  mv gstreamer-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
-}
diff --git a/testing/libcanberra/libcanberra-gtk-module.sh b/testing/libcanberra/libcanberra-gtk-module.sh
deleted file mode 100644
index fbb7ff783..000000000
--- a/testing/libcanberra/libcanberra-gtk-module.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ -z "$GTK_MODULES" ] ; then
-	GTK_MODULES="canberra-gtk-module"
-else
-	GTK_MODULES="$GTK_MODULES:canberra-gtk-module"
-fi
-
-export GTK_MODULES
-
diff --git a/testing/libcanberra/libcanberra-quit-add.patch b/testing/libcanberra/libcanberra-quit-add.patch
deleted file mode 100644
index 0094569ae..000000000
--- a/testing/libcanberra/libcanberra-quit-add.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up libcanberra-0.26/src/canberra-gtk-module.c.quit-add libcanberra-0.26/src/canberra-gtk-module.c
---- libcanberra-0.26/src/canberra-gtk-module.c.quit-add	2011-01-07 22:48:49.388992626 -0500
-+++ libcanberra-0.26/src/canberra-gtk-module.c	2011-01-07 22:49:02.339995153 -0500
-@@ -932,11 +932,6 @@ static void connect_settings(void) {
-         connected = TRUE;
- }
- 
--static gboolean quit_handler(gpointer data) {
--        dispatch_queue();
--        return FALSE;
--}
--
- G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
- 
-         /* This is the same quark libgnomeui uses! */
-@@ -963,8 +958,6 @@ G_MODULE_EXPORT void gtk_module_init(gin
-         install_hook(GTK_TYPE_WIDGET, "drag-drop", &signal_id_widget_drag_drop);
-         install_hook(GTK_TYPE_WIDGET, "drag-failed", &signal_id_widget_drag_failed);
-         install_hook(GTK_TYPE_EXPANDER, "activate", &signal_id_expander_activate);
--
--        gtk_quit_add(1, quit_handler, NULL);
- }
- 
- G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);
diff --git a/testing/libcanberra/libcanberra.install b/testing/libcanberra/libcanberra.install
deleted file mode 100644
index 7f5012199..000000000
--- a/testing/libcanberra/libcanberra.install
+++ /dev/null
@@ -1,23 +0,0 @@
-pkgname=libcanberra
-
-post_install() {
-  if [ -x usr/sbin/gconfpkg ]; then
-    usr/sbin/gconfpkg --install ${pkgname}
-  fi
-}
-
-pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    pre_remove
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  if [ -x usr/sbin/gconfpkg ]; then
-    usr/sbin/gconfpkg --uninstall ${pkgname}
-  fi
-}
diff --git a/testing/libchamplain/PKGBUILD b/testing/libchamplain/PKGBUILD
deleted file mode 100644
index 199654e11..000000000
--- a/testing/libchamplain/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 117872 2011-04-04 20:57:39Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Michael Kanis <mkanis@gmx.de>
-
-pkgname=libchamplain
-pkgver=0.10.0
-pkgrel=2
-pkgdesc="Gtk3 widget for displaying rasterized maps"
-url="http://projects.gnome.org/libchamplain/"
-license=('LGPL')
-arch=('i686' 'x86_64' 'mips64el')
-options=('!libtool')
-depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite3')
-makedepends=('gobject-introspection' 'gtk-doc' 'vala')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('98700bb3f3ada5f9bd6b938486e55f90ea76ce4108a8b62928cf185ded49dbb1')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    ./configure --prefix=/usr --disable-static --disable-debug \
-        --enable-vala
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install
-}
diff --git a/testing/libdmapsharing/PKGBUILD b/testing/libdmapsharing/PKGBUILD
deleted file mode 100644
index 2347fc4f7..000000000
--- a/testing/libdmapsharing/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 117405 2011-04-01 16:34:19Z ibiru $
-#Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=libdmapsharing
-pkgver=2.9.7
-pkgrel=1
-pkgdesc="Libdmapsharing is a library you may use to access and share DMAP content"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.flyn.org/projects/libdmapsharing/index.html"
-license=('LGPL2.1')
-depends=('libsoup' 'avahi' 'gstreamer0.10-base' 'gdk-pixbuf2')
-options=('!libtool')
-source=(http://www.flyn.org/projects/libdmapsharing/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5eeded6d82ed2c2f6f310b9bd484798c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --with-mdns=avahi
-  make
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libgda/PKGBUILD b/testing/libgda/PKGBUILD
deleted file mode 100644
index c24e4d6fb..000000000
--- a/testing/libgda/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 120419 2011-04-23 21:33:28Z ibiru $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=libgda
-pkgver=4.2.6
-pkgrel=1
-pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('gtksourceview2' 'libunique' 'libxslt' 'db' 'ncurses' 'libsoup'
-         'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring'
-         'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('intltool' 'gobject-introspection' 'namcap')
-options=('!libtool')
-url="http://www.gnome-db.org"
-install=libgda.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('141259e19ba163500963bd5bd512cfa4eb542b24c99f2fa14a2ef27643308cd3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i '1s/python$/&2/' libgda-report/RML/trml*/trml*.py
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --with-bdb=/usr --with-bdb-libdir-name=lib \
-      --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libgda/libgda.install b/testing/libgda/libgda.install
deleted file mode 100644
index c317fbaca..000000000
--- a/testing/libgda/libgda.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/libgdata/PKGBUILD b/testing/libgdata/PKGBUILD
deleted file mode 100644
index a17561ee6..000000000
--- a/testing/libgdata/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 109662 2011-02-11 17:56:10Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgdata
-pkgver=0.8.0
-pkgrel=1
-pkgdesc="GLib-based library for accessing online service APIs using the GData protocol"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libsoup-gnome')
-makedepends=('pkgconfig' 'intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1a816dda7de8ce162e00cc1c782a5ae25230a36d56c590a67d86848058797c9f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libgnome-keyring/PKGBUILD b/testing/libgnome-keyring/PKGBUILD
deleted file mode 100644
index 158699992..000000000
--- a/testing/libgnome-keyring/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-#$Id: PKGBUILD 120579 2011-04-25 17:26:49Z ibiru $
-#Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=libgnome-keyring
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="GNOME keyring client library"
-arch=(i686 x86_64 'mips64el')
-license=('GPL' 'LGPL')
-depends=('dbus-core' 'libgcrypt' 'glib2')
-makedepends=('intltool' 'pkgconfig')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9d748842dab86914488bef039ca2c25f8ff5510daae3815643e6e00a2f69cacb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-keyring
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libgnome-media-profiles/PKGBUILD b/testing/libgnome-media-profiles/PKGBUILD
deleted file mode 100644
index ee4b19be5..000000000
--- a/testing/libgnome-media-profiles/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 117708 2011-04-04 16:55:18Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=libgnome-media-profiles
-pkgver=3.0.0
-pkgrel=2
-pkgdesc=""
-arch=(i686 x86_64 'mips64el')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('gconf' 'gtk3' 'gstreamer0.10-base-plugins')
-makedepends=('intltool' 'gnome-doc-utils')
-options=('!emptydirs' '!libtool')
-install=libgnome-media-profiles.install
-source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ab1288e53a8fccca3e8fa59757ef586901e236e09a737a1178eeb8d74428c061')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --disable-static -disable-scrollkeeper \
-    --disable-schemas-install
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-audio-profiles "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libgnome-media-profiles/libgnome-media-profiles.install b/testing/libgnome-media-profiles/libgnome-media-profiles.install
deleted file mode 100644
index 22b4c8f12..000000000
--- a/testing/libgnome-media-profiles/libgnome-media-profiles.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=libgnome-media-profiles
-
-post_install(){
-    usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-    pre_remove $1
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/libgnomekbd/PKGBUILD b/testing/libgnomekbd/PKGBUILD
deleted file mode 100644
index 25b12329a..000000000
--- a/testing/libgnomekbd/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 118220 2011-04-06 06:15:37Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgnomekbd
-pkgver=3.0.0.1
-pkgrel=1
-pkgdesc="Gnome keyboard library"
-url="http://gswitchit.sourceforge.net"
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-depends=('libxklavier>=5.1' 'gtk3' 'dconf')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-install=libgnomekbd.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('727293963847761b7942d9c5c195c317a5f5f18585ebc6d348147924242902e9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libgnomekbd/libgnomekbd.install b/testing/libgnomekbd/libgnomekbd.install
deleted file mode 100644
index 2ef26aaa9..000000000
--- a/testing/libgnomekbd/libgnomekbd.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/libgpod/PKGBUILD b/testing/libgpod/PKGBUILD
deleted file mode 100644
index 18556eefb..000000000
--- a/testing/libgpod/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 117411 2011-04-01 17:02:09Z ibiru $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=libgpod
-pkgver=0.8.0
-pkgrel=2
-pkgdesc="A shared library to access the contents of an iPod"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL')
-depends=('gtk2' 'mutagen' 'sg3_utils' 'libimobiledevice')
-makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject-devel' 'gtk-sharp-2')
-optdepends=('gtk-sharp-2: Mono bindings')
-url="http://www.gtkpod.org/libgpod/"
-source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.gz)
-options=('!libtool' '!emptydirs')
-md5sums=('6660f74cc53293dcc847407aa5f672ce')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-      --enable-udev --with-python=/usr/bin/python2
-  make PREFIX=/usr
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
-}
-
diff --git a/testing/libgtop/PKGBUILD b/testing/libgtop/PKGBUILD
deleted file mode 100644
index 889f6e279..000000000
--- a/testing/libgtop/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 120401 2011-04-23 20:45:46Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgtop
-pkgver=2.28.3
-pkgrel=1
-pkgdesc="A library that read information about processes and the running system"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('glib2' 'libxau' 'texinfo')
-makedepends=('intltool' 'gobject-introspection')
-install=libgtop.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool')
-url="http://www.gnome.org/"
-sha256sums=('2c866bd14b3cd78f78504cfb65baa105d62b8085c90e433ab9db97e050efea42')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --with-libgtop-smp
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libgtop/libgtop.install b/testing/libgtop/libgtop.install
deleted file mode 100644
index 15690f125..000000000
--- a/testing/libgtop/libgtop.install
+++ /dev/null
@@ -1,13 +0,0 @@
-info_dir=/usr/share/info
-
-post_install() {
-  install-info ${info_dir}/libgtop2.info.gz ${info_dir}/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  install-info --delete ${info_dir}/libgtop2.info.gz ${info_dir}/dir 2> /dev/null
-}
diff --git a/testing/libgweather/01_gettext_not_xml.patch b/testing/libgweather/01_gettext_not_xml.patch
deleted file mode 100644
index d5f57305e..000000000
--- a/testing/libgweather/01_gettext_not_xml.patch
+++ /dev/null
@@ -1,527 +0,0 @@
-only in patch2:
-unchanged:
-diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/configure.in libgweather-2.27.91.new/configure.in
---- libgweather-2.27.91/configure.in	2009-08-25 23:56:58.000000000 +1000
-+++ libgweather-2.27.91.new/configure.in	2009-08-26 11:54:52.000000000 +1000
-@@ -40,6 +40,10 @@
- AM_MAINTAINER_MODE
- GNOME_MAINTAINER_MODE_DEFINES
- 
-+dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations
-+AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile])
-+IT_PO_SUBDIR([po-locations])
-+
- IT_PROG_INTLTOOL([0.40.3])
- PKG_PROG_PKG_CONFIG([0.19])
- 
-@@ -50,13 +54,6 @@
- AM_PROG_LIBTOOL
- AC_PATH_PROG(GCONFTOOL, gconftool-2)
- 
--AC_ARG_ENABLE(all-translations-in-one-xml,
--        [AC_HELP_STRING([--enable-all-translations-in-one-xml],
--                        [Put all translations in a big Locations.xml file (slow to parse)])],
--        [enable_big_xml=yes],
--        [enable_big_xml=no])
--AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes")
--
- AC_ARG_ENABLE(locations-compression,
-         [AC_HELP_STRING([--enable-locations-compression],
-                         [Compress Locations.xml files])],
-@@ -253,7 +250,7 @@
- Makefile
- doc/Makefile
- po/Makefile.in
--po-locations/Makefile
-+po-locations/Makefile.in
- libgweather/Makefile
- libgweather/gweather.pc
- libgweather/gweather-uninstalled.pc
-@@ -261,12 +258,6 @@
- python/Makefile
- ])
- 
--if test "x$enable_big_xml" = "xyes"; then
--	LOCATIONS_XML_TRANSLATIONS="one big file"
--else
--	LOCATIONS_XML_TRANSLATIONS="one file per translation"
--fi
--
- dnl ***************************************************************************
- dnl *** Display Summary                                                     ***
- dnl ***************************************************************************
-diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/data/Makefile.am libgweather-2.27.91.new/data/Makefile.am
---- libgweather-2.27.91/data/Makefile.am	2009-07-22 03:01:11.000000000 +1000
-+++ libgweather-2.27.91.new/data/Makefile.am	2009-08-26 11:57:46.000000000 +1000
-@@ -4,55 +4,23 @@
- libgweatherlocationsdir = $(pkgdatadir)
- libgweatherlocations_in_files = Locations.xml.in
- 
--if USE_ONE_BIG_XML
--
--LOCATIONS_STAMP = 
--
--libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT))
--
--%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
--	$(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
--	if test "x$(COMPRESS_EXT)" = "x.gz"; then				\
--		gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`;	\
--	fi
--
--else # USE_ONE_BIG_XML
--
- LOCATIONS_STAMP = stamp-Locations.xml
- 
--PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi)
--
- # Helper variable
--libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml)
--
--libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT)
-+libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml)
- 
- # We need this step so that we merge all the make Locations.xy.xml destinations
- # into one unique destination. This makes -j2 work. (Else, we end up with
- # multiple and conflicting calls to intltool-merge)
- $(libgweatherlocations_DATA): $(LOCATIONS_STAMP)
- 
--$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile
--	$(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \
--	for pofile in $(PO_LOCATIONS); do \
--		locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`;	\
--		xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \
--		rm -f $$locale/$(libgweatherlocations_data);		\
--		test -d $$locale && rmdir $$locale;			\
--		if test "x$(COMPRESS_EXT)" = "x.gz"; then		\
--			gzip --force Locations.$$locale.xml;		\
--		fi;							\
--	done &&								\
--	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \
--	rm -f C/$(libgweatherlocations_data) &&				\
-+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile
-+	LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA)  && \
-+	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) && \
-+	rm -f C/$(libgweatherlocations_DATA) &&				\
- 	test -d C && rmdir C &&						\
--	if test "x$(COMPRESS_EXT)" = "x.gz"; then			\
--		gzip --force Locations.xml;				\
--	fi &&								\
- 	touch $@
- 
--endif # USE_ONE_BIG_XML
--
- check:
- 	xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in
- 	$(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in
-diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/libgweather/gweather-location.c libgweather-2.27.91.new/libgweather/gweather-location.c
---- libgweather-2.27.91/libgweather/gweather-location.c	2009-04-20 03:41:11.000000000 +1000
-+++ libgweather-2.27.91.new/libgweather/gweather-location.c	2009-08-26 11:54:52.000000000 +1000
-@@ -22,11 +22,14 @@
- #include <config.h>
- #endif
- 
-+#include "config.h"
-+
- #include <string.h>
- #include <math.h>
- #include <locale.h>
- #include <gtk/gtk.h>
- #include <libxml/xmlreader.h>
-+#include <libintl.h>
- 
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-location.h"
-@@ -184,10 +187,20 @@
- 
- 	tagname = (const char *) xmlTextReaderConstName (parser->xml);
- 	if (!strcmp (tagname, "name") && !loc->name) {
--	    value = gweather_parser_get_localized_value (parser);
-+	    char *context = NULL;
-+	    context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
-+	   
-+	    value = gweather_parser_get_value (parser);
- 	    if (!value)
- 		goto error_out;
--	    loc->name = g_strdup (value);
-+
-+	    if (context != NULL) {
-+	    	loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value));
-+	    	xmlFree (context);
-+	    }
-+	    else
-+	    	loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value));
-+	    
- 	    xmlFree (value);
- 	    normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
- 	    loc->sort_name = g_utf8_casefold (normalized, -1);
-diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/libgweather/gweather-timezone.c libgweather-2.27.91.new/libgweather/gweather-timezone.c
---- libgweather-2.27.91/libgweather/gweather-timezone.c	2009-08-12 19:00:52.000000000 +1000
-+++ libgweather-2.27.91.new/libgweather/gweather-timezone.c	2009-08-26 11:54:52.000000000 +1000
-@@ -23,6 +23,7 @@
- #endif
- 
- #include <string.h>
-+#include <libintl.h>
- 
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-timezone.h"
-@@ -152,7 +153,7 @@
- parse_timezone (GWeatherParser *parser)
- {
-     GWeatherTimezone *zone = NULL;
--    char *id = NULL, *name = NULL;
-+    char *id = NULL, *name = NULL, *context = NULL;
-     int offset = 0, dst_offset = 0;
-     gboolean has_dst = FALSE;
- 
-@@ -175,27 +176,34 @@
- 		continue;
- 	    }
- 
--	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name"))
--		name = gweather_parser_get_localized_value (parser);
-+	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) {
-+		context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
-+		name = gweather_parser_get_value (parser);
-+	    }
- 	    else {
- 		if (xmlTextReaderNext (parser->xml) != 1)
- 		    break;
- 	    }
- 	}
-     }
--
-+	    
-     if (parse_tzdata (id, parser->year_start, parser->year_end,
- 		      &offset, &has_dst, &dst_offset)) {
- 	zone = g_slice_new0 (GWeatherTimezone);
- 	zone->ref_count = 1;
- 	zone->id = g_strdup (id);
--	zone->name = g_strdup (name);
-+	if (context != NULL)
-+		zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name));
-+	else
-+		zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name));
- 	zone->offset = offset;
- 	zone->has_dst = has_dst;
- 	zone->dst_offset = dst_offset;
-     }
- 
-     xmlFree (id);
-+    if (context)
-+    	xmlFree (context);
-     if (name)
- 	xmlFree (name);
- 
-diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/LINGUAS libgweather-2.27.91.new/po-locations/LINGUAS
---- libgweather-2.27.91/po-locations/LINGUAS	1970-01-01 10:00:00.000000000 +1000
-+++ libgweather-2.27.91.new/po-locations/LINGUAS	2009-08-26 11:54:52.000000000 +1000
-@@ -0,0 +1,78 @@
-+ang
-+ar
-+as
-+az
-+be
-+be@latin
-+bg
-+bn_IN
-+bn
-+bs
-+ca
-+cs
-+cy
-+da
-+de
-+dz
-+el
-+en_CA
-+en_GB
-+es
-+et
-+eu
-+fa
-+fi
-+fr
-+ga
-+gl
-+gu
-+he
-+hi
-+hr
-+hu
-+id
-+it
-+ja
-+ka
-+kn
-+ko
-+ku
-+ky
-+lt
-+lv
-+mai
-+mg
-+mk
-+ml
-+mn
-+mr
-+ms
-+nb
-+ne
-+nl
-+nn
-+oc
-+or
-+pa
-+pl
-+pt_BR
-+pt
-+ro
-+ru
-+rw
-+si
-+sk
-+sl
-+sq
-+sr@latin
-+sr
-+sv
-+ta
-+te
-+th
-+tr
-+uk
-+vi
-+zh_CN
-+zh_HK
-+zh_TW
-diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/Makefile.in.in libgweather-2.27.91.new/po-locations/Makefile.in.in
---- libgweather-2.27.91/po-locations/Makefile.in.in	1970-01-01 10:00:00.000000000 +1000
-+++ libgweather-2.27.91.new/po-locations/Makefile.in.in	2009-08-26 11:54:52.000000000 +1000
-@@ -0,0 +1,217 @@
-+# Makefile for program source directory in GNU NLS utilities package.
-+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
-+#
-+# This file may be copied and used freely without restrictions.  It may
-+# be used in projects which are not available under a GNU Public License,
-+# but which still want to provide support for the GNU gettext functionality.
-+#
-+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-+#
-+# - Modified by jacob berkman <jacob@ximian.com> to install
-+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-+#
-+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
-+#
-+# We have the following line for use by intltoolize:
-+# INTLTOOL_MAKEFILE
-+
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations
-+PACKAGE = @PACKAGE@
-+VERSION = @VERSION@
-+
-+SHELL = /bin/sh
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = @top_builddir@
-+VPATH = @srcdir@
-+
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+libdir = @libdir@
-+DATADIRNAME = @DATADIRNAME@
-+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+subdir = po-locations
-+install_sh = @install_sh@
-+# Automake >= 1.8 provides @mkdir_p@.
-+# Until it can be supposed, use the safe fallback:
-+mkdir_p = $(install_sh) -d
-+
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+
-+GMSGFMT = @GMSGFMT@
-+MSGFMT = @MSGFMT@
-+XGETTEXT = @XGETTEXT@
-+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-+
-+ALL_LINGUAS = @ALL_LINGUAS@
-+
-+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-+
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-+
-+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-+
-+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-+
-+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
-+
-+POTFILES = \
-+# This comment gets stripped out
-+
-+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-+
-+.SUFFIXES:
-+.SUFFIXES: .po .pox .gmo .mo .msg .cat
-+
-+.po.pox:
-+	$(MAKE) $(GETTEXT_PACKAGE).pot
-+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-+
-+.po.mo:
-+	$(MSGFMT) -o $@ $<
-+
-+.po.gmo:
-+	file=`echo $* | sed 's,.*/,,'`.gmo \
-+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-+
-+.po.cat:
-+	sed -f ../intl/po2msg.sed < $< > $*.msg \
-+	  && rm -f $@ && gencat $@ $*.msg
-+
-+
-+all: all-@USE_NLS@
-+
-+all-yes: $(CATALOGS)
-+all-no:
-+
-+$(GETTEXT_PACKAGE).pot: $(POTFILES)
-+	$(GENPOT)
-+
-+install: install-data
-+install-data: install-data-@USE_NLS@
-+install-data-no: all
-+install-data-yes: all
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-+	  $(mkdir_p) $$dir; \
-+	  if test -r $$lang.gmo; then \
-+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-+	  else \
-+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+	    echo "installing $(srcdir)/$$lang.gmo as" \
-+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
-+	  fi; \
-+	  if test -r $$lang.gmo.m; then \
-+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+	  else \
-+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+	    else \
-+	      true; \
-+	    fi; \
-+	  fi; \
-+	done
-+
-+# Empty stubs to satisfy archaic automake needs
-+dvi info tags TAGS ID:
-+
-+# Define this as empty until I found a useful application.
-+install-exec installcheck:
-+
-+uninstall:
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-+	done
-+
-+check: all $(GETTEXT_PACKAGE).pot
-+	rm -f missing notexist
-+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-+	if [ -r missing -o -r notexist ]; then \
-+	  exit 1; \
-+	fi
-+
-+mostlyclean:
-+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-+	rm -f .intltool-merge-cache
-+
-+clean: mostlyclean
-+
-+distclean: clean
-+	rm -f Makefile Makefile.in POTFILES stamp-it
-+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
-+
-+maintainer-clean: distclean
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+	rm -f Makefile.in.in
-+
-+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-+dist distdir: $(DISTFILES)
-+	dists="$(DISTFILES)"; \
-+	extra_dists="$(EXTRA_DISTFILES)"; \
-+	for file in $$extra_dists; do \
-+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-+	done; \
-+	for file in $$dists; do \
-+	  test -f $$file || file="$(srcdir)/$$file"; \
-+	  ln $$file $(distdir) 2> /dev/null \
-+	    || cp -p $$file $(distdir); \
-+	done
-+
-+update-po: Makefile
-+	$(MAKE) $(GETTEXT_PACKAGE).pot
-+	tmpdir=`pwd`; \
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  echo "$$lang:"; \
-+	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-+	  if $$result; then \
-+	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-+	      rm -f $$tmpdir/$$lang.new.po; \
-+            else \
-+	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-+	        :; \
-+	      else \
-+	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-+	        rm -f $$tmpdir/$$lang.new.po; \
-+	        exit 1; \
-+	      fi; \
-+	    fi; \
-+	  else \
-+	    echo "msgmerge for $$lang.gmo failed!"; \
-+	    rm -f $$tmpdir/$$lang.new.po; \
-+	  fi; \
-+	done
-+
-+Makefile POTFILES: stamp-it
-+	@if test ! -f $@; then \
-+	  rm -f stamp-it; \
-+	  $(MAKE) stamp-it; \
-+	fi
-+
-+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-+	       $(SHELL) ./config.status
-+
-+# Tell versions [3.59,3.63) of GNU make not to export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/POTFILES.in libgweather-2.27.91.new/po-locations/POTFILES.in
---- libgweather-2.27.91/po-locations/POTFILES.in	1970-01-01 10:00:00.000000000 +1000
-+++ libgweather-2.27.91.new/po-locations/POTFILES.in	2009-08-26 11:54:52.000000000 +1000
-@@ -0,0 +1,4 @@
-+# This list should contain *only* data/Locations.xml.in.
-+# Everything else should be in POTFILES.skip.
-+[encoding:UTF-8]
-+data/Locations.xml.in
diff --git a/testing/libgweather/PKGBUILD b/testing/libgweather/PKGBUILD
deleted file mode 100644
index 9de18bb05..000000000
--- a/testing/libgweather/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 117926 2011-04-04 21:33:29Z heftig $
-# Maintainer: Jan de Groot  <jgc@archlinux.org>
-
-pkgname=libgweather
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Provides access to weather information from the net"
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-depends=('gconf' 'libsoup-gnome' 'gnome-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org/"
-install=libgweather.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        gettext-not-xml.patch)
-sha256sums=('f13eb69c6ec8c4db08a78ffe980a5dd0e194894d411691a6821a068c650d1545'
-            'f21d55ab7916a50cad10d1c0bb3785a262e8ad8f35b9fb4c02ae23f1b0783727')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    patch -Np1 -i "${srcdir}/gettext-not-xml.patch"
-    gtkdocize
-    autoreconf -fi
-
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --localstatedir=/var --disable-static \
-        --enable-locations-compression
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-    install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-    gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgweather ${pkgdir}/etc/gconf/schemas/*.schemas
-    rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/libgweather/gettext-not-xml.patch b/testing/libgweather/gettext-not-xml.patch
deleted file mode 100644
index 4fd2e3aa6..000000000
--- a/testing/libgweather/gettext-not-xml.patch
+++ /dev/null
@@ -1,533 +0,0 @@
-diff -up libgweather-2.91.0/configure.ac.gettext libgweather-2.91.0/configure.ac
---- libgweather-2.91.0/configure.ac.gettext	2010-10-04 18:08:07.000000000 -0400
-+++ libgweather-2.91.0/configure.ac	2011-01-30 13:51:19.615635059 -0500
-@@ -40,6 +40,10 @@ LIBXML_REQUIRED=2.6.0
- AM_MAINTAINER_MODE
- GNOME_MAINTAINER_MODE_DEFINES
- 
-+dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations
-+AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile])
-+IT_PO_SUBDIR([po-locations])
-+
- IT_PROG_INTLTOOL([0.40.3])
- PKG_PROG_PKG_CONFIG([0.19])
- 
-@@ -50,13 +54,6 @@ AC_STDC_HEADERS
- AM_PROG_LIBTOOL
- AC_PATH_PROG(GCONFTOOL, gconftool-2)
- 
--AC_ARG_ENABLE(all-translations-in-one-xml,
--        [AC_HELP_STRING([--enable-all-translations-in-one-xml],
--                        [Put all translations in a big Locations.xml file (slow to parse)])],
--        [enable_big_xml=yes],
--        [enable_big_xml=no])
--AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes")
--
- AC_ARG_ENABLE(locations-compression,
-         [AC_HELP_STRING([--enable-locations-compression],
-                         [Compress Locations.xml files])],
-@@ -236,7 +233,7 @@ AC_OUTPUT([
- Makefile
- doc/Makefile
- po/Makefile.in
--po-locations/Makefile
-+po-locations/Makefile.in
- libgweather/Makefile
- libgweather/gweather-3.0.pc
- libgweather/gweather-3.0-uninstalled.pc
-@@ -244,12 +241,6 @@ data/Makefile
- icons/Makefile
- ])
- 
--if test "x$enable_big_xml" = "xyes"; then
--	LOCATIONS_XML_TRANSLATIONS="one big file"
--else
--	LOCATIONS_XML_TRANSLATIONS="one file per translation"
--fi
--
- dnl ***************************************************************************
- dnl *** Display Summary                                                     ***
- dnl ***************************************************************************
-@@ -260,6 +251,4 @@ libgweather-$VERSION configure summary:
- 	Source code location:		${srcdir}
- 	Compiler:			${CC}
- 	Introspection support:          ${found_introspection}
--	Locations.xml translations:	${LOCATIONS_XML_TRANSLATIONS}
--	Locations.xml compression:	${enable_locations_compression}
- " >&2
-diff -up libgweather-2.91.0/data/Makefile.am.gettext libgweather-2.91.0/data/Makefile.am
---- libgweather-2.91.0/data/Makefile.am.gettext	2010-10-04 18:07:31.000000000 -0400
-+++ libgweather-2.91.0/data/Makefile.am	2011-01-30 13:53:12.581466339 -0500
-@@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd
- libgweatherlocationsdir = $(pkgdatadir)
- libgweatherlocations_in_files = Locations.xml.in
- 
--if USE_ONE_BIG_XML
--
--LOCATIONS_STAMP = 
--
--libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT))
--
--%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
--	$(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
--	if test "x$(COMPRESS_EXT)" = "x.gz"; then				\
--		gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`;	\
--	fi
--
--else # USE_ONE_BIG_XML
--
- LOCATIONS_STAMP = stamp-Locations.xml
- 
--PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi)
--
- # Helper variable
--libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml)
--
--libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT)
-+libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml)
- 
- # We need this step so that we merge all the make Locations.xy.xml destinations
- # into one unique destination. This makes -j2 work. (Else, we end up with
- # multiple and conflicting calls to intltool-merge)
- $(libgweatherlocations_DATA): $(LOCATIONS_STAMP)
- 
--$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile
--	$(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \
--	for pofile in $(PO_LOCATIONS); do \
--		locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`;	\
--		xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \
--		rm -f $$locale/$(libgweatherlocations_data);		\
--		test -d $$locale && rmdir $$locale;			\
--		if test "x$(COMPRESS_EXT)" = "x.gz"; then		\
--			gzip --force Locations.$$locale.xml;		\
--		fi;							\
--	done &&								\
--	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \
--	rm -f C/$(libgweatherlocations_data) &&				\
--	test -d C && rmdir C &&						\
--	if test "x$(COMPRESS_EXT)" = "x.gz"; then			\
--		gzip --force Locations.xml;				\
--	fi &&								\
-+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile
-+	LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA)
-+	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA)
-+	rm -f C/$(libgweatherlocations_DATA)
-+	test -d C && rmdir C
- 	touch $@
- 
--endif # USE_ONE_BIG_XML
--
- ### Locations.xml.in rebuild
- rebuild-locations: locationdb.sqlite update-locations.py
- 	$(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new
-diff -up libgweather-2.91.0/libgweather/gweather-location.c.gettext libgweather-2.91.0/libgweather/gweather-location.c
---- libgweather-2.91.0/libgweather/gweather-location.c.gettext	2010-02-09 07:28:03.000000000 -0500
-+++ libgweather-2.91.0/libgweather/gweather-location.c	2011-01-30 13:51:19.616635049 -0500
-@@ -22,11 +22,14 @@
- #include <config.h>
- #endif
- 
-+#include "config.h"
-+
- #include <string.h>
- #include <math.h>
- #include <locale.h>
- #include <gtk/gtk.h>
- #include <libxml/xmlreader.h>
-+#include <libintl.h>
- 
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-location.h"
-@@ -184,10 +187,20 @@ location_new_from_xml (GWeatherParser *p
- 
- 	tagname = (const char *) xmlTextReaderConstName (parser->xml);
- 	if (!strcmp (tagname, "name") && !loc->name) {
--	    value = gweather_parser_get_localized_value (parser);
-+	    char *context = NULL;
-+	    context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
-+	   
-+	    value = gweather_parser_get_value (parser);
- 	    if (!value)
- 		goto error_out;
--	    loc->name = g_strdup (value);
-+
-+	    if (context != NULL) {
-+	    	loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value));
-+	    	xmlFree (context);
-+	    }
-+	    else
-+	    	loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value));
-+	    
- 	    xmlFree (value);
- 	    normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
- 	    loc->sort_name = g_utf8_casefold (normalized, -1);
-diff -up libgweather-2.91.0/libgweather/gweather-timezone.c.gettext libgweather-2.91.0/libgweather/gweather-timezone.c
---- libgweather-2.91.0/libgweather/gweather-timezone.c.gettext	2010-02-09 07:28:03.000000000 -0500
-+++ libgweather-2.91.0/libgweather/gweather-timezone.c	2011-01-30 13:51:19.617635039 -0500
-@@ -23,6 +23,7 @@
- #endif
- 
- #include <string.h>
-+#include <libintl.h>
- 
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-timezone.h"
-@@ -152,7 +153,7 @@ static GWeatherTimezone *
- parse_timezone (GWeatherParser *parser)
- {
-     GWeatherTimezone *zone = NULL;
--    char *id = NULL, *name = NULL;
-+    char *id = NULL, *name = NULL, *context = NULL;
-     int offset = 0, dst_offset = 0;
-     gboolean has_dst = FALSE;
- 
-@@ -175,27 +176,34 @@ parse_timezone (GWeatherParser *parser)
- 		continue;
- 	    }
- 
--	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name"))
--		name = gweather_parser_get_localized_value (parser);
-+	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) {
-+		context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
-+		name = gweather_parser_get_value (parser);
-+	    }
- 	    else {
- 		if (xmlTextReaderNext (parser->xml) != 1)
- 		    break;
- 	    }
- 	}
-     }
--
-+	    
-     if (parse_tzdata (id, parser->year_start, parser->year_end,
- 		      &offset, &has_dst, &dst_offset)) {
- 	zone = g_slice_new0 (GWeatherTimezone);
- 	zone->ref_count = 1;
- 	zone->id = g_strdup (id);
--	zone->name = g_strdup (name);
-+	if (context != NULL)
-+		zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name));
-+	else
-+		zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name));
- 	zone->offset = offset;
- 	zone->has_dst = has_dst;
- 	zone->dst_offset = dst_offset;
-     }
- 
-     xmlFree (id);
-+    if (context)
-+    	xmlFree (context);
-     if (name)
- 	xmlFree (name);
- 
-diff -up libgweather-2.91.0/po-locations/LINGUAS.gettext libgweather-2.91.0/po-locations/LINGUAS
---- libgweather-2.91.0/po-locations/LINGUAS.gettext	2011-01-30 13:51:19.617635039 -0500
-+++ libgweather-2.91.0/po-locations/LINGUAS	2011-01-30 13:51:19.617635039 -0500
-@@ -0,0 +1,78 @@
-+ang
-+ar
-+as
-+az
-+be
-+be@latin
-+bg
-+bn_IN
-+bn
-+bs
-+ca
-+cs
-+cy
-+da
-+de
-+dz
-+el
-+en_CA
-+en_GB
-+es
-+et
-+eu
-+fa
-+fi
-+fr
-+ga
-+gl
-+gu
-+he
-+hi
-+hr
-+hu
-+id
-+it
-+ja
-+ka
-+kn
-+ko
-+ku
-+ky
-+lt
-+lv
-+mai
-+mg
-+mk
-+ml
-+mn
-+mr
-+ms
-+nb
-+ne
-+nl
-+nn
-+oc
-+or
-+pa
-+pl
-+pt_BR
-+pt
-+ro
-+ru
-+rw
-+si
-+sk
-+sl
-+sq
-+sr@latin
-+sr
-+sv
-+ta
-+te
-+th
-+tr
-+uk
-+vi
-+zh_CN
-+zh_HK
-+zh_TW
-diff -up libgweather-2.91.0/po-locations/Makefile.in.in.gettext libgweather-2.91.0/po-locations/Makefile.in.in
---- libgweather-2.91.0/po-locations/Makefile.in.in.gettext	2011-01-30 13:51:19.618635028 -0500
-+++ libgweather-2.91.0/po-locations/Makefile.in.in	2011-01-30 13:51:19.618635028 -0500
-@@ -0,0 +1,217 @@
-+# Makefile for program source directory in GNU NLS utilities package.
-+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
-+#
-+# This file may be copied and used freely without restrictions.  It may
-+# be used in projects which are not available under a GNU Public License,
-+# but which still want to provide support for the GNU gettext functionality.
-+#
-+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-+#
-+# - Modified by jacob berkman <jacob@ximian.com> to install
-+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-+#
-+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
-+#
-+# We have the following line for use by intltoolize:
-+# INTLTOOL_MAKEFILE
-+
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations
-+PACKAGE = @PACKAGE@
-+VERSION = @VERSION@
-+
-+SHELL = /bin/sh
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = @top_builddir@
-+VPATH = @srcdir@
-+
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+libdir = @libdir@
-+DATADIRNAME = @DATADIRNAME@
-+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+subdir = po-locations
-+install_sh = @install_sh@
-+# Automake >= 1.8 provides @mkdir_p@.
-+# Until it can be supposed, use the safe fallback:
-+mkdir_p = $(install_sh) -d
-+
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+
-+GMSGFMT = @GMSGFMT@
-+MSGFMT = @MSGFMT@
-+XGETTEXT = @XGETTEXT@
-+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-+
-+ALL_LINGUAS = @ALL_LINGUAS@
-+
-+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-+
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-+
-+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-+
-+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-+
-+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
-+
-+POTFILES = \
-+# This comment gets stripped out
-+
-+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-+
-+.SUFFIXES:
-+.SUFFIXES: .po .pox .gmo .mo .msg .cat
-+
-+.po.pox:
-+	$(MAKE) $(GETTEXT_PACKAGE).pot
-+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-+
-+.po.mo:
-+	$(MSGFMT) -o $@ $<
-+
-+.po.gmo:
-+	file=`echo $* | sed 's,.*/,,'`.gmo \
-+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-+
-+.po.cat:
-+	sed -f ../intl/po2msg.sed < $< > $*.msg \
-+	  && rm -f $@ && gencat $@ $*.msg
-+
-+
-+all: all-@USE_NLS@
-+
-+all-yes: $(CATALOGS)
-+all-no:
-+
-+$(GETTEXT_PACKAGE).pot: $(POTFILES)
-+	$(GENPOT)
-+
-+install: install-data
-+install-data: install-data-@USE_NLS@
-+install-data-no: all
-+install-data-yes: all
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-+	  $(mkdir_p) $$dir; \
-+	  if test -r $$lang.gmo; then \
-+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-+	  else \
-+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+	    echo "installing $(srcdir)/$$lang.gmo as" \
-+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
-+	  fi; \
-+	  if test -r $$lang.gmo.m; then \
-+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+	  else \
-+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+	    else \
-+	      true; \
-+	    fi; \
-+	  fi; \
-+	done
-+
-+# Empty stubs to satisfy archaic automake needs
-+dvi info tags TAGS ID:
-+
-+# Define this as empty until I found a useful application.
-+install-exec installcheck:
-+
-+uninstall:
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-+	done
-+
-+check: all $(GETTEXT_PACKAGE).pot
-+	rm -f missing notexist
-+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-+	if [ -r missing -o -r notexist ]; then \
-+	  exit 1; \
-+	fi
-+
-+mostlyclean:
-+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-+	rm -f .intltool-merge-cache
-+
-+clean: mostlyclean
-+
-+distclean: clean
-+	rm -f Makefile Makefile.in POTFILES stamp-it
-+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
-+
-+maintainer-clean: distclean
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+	rm -f Makefile.in.in
-+
-+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-+dist distdir: $(DISTFILES)
-+	dists="$(DISTFILES)"; \
-+	extra_dists="$(EXTRA_DISTFILES)"; \
-+	for file in $$extra_dists; do \
-+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-+	done; \
-+	for file in $$dists; do \
-+	  test -f $$file || file="$(srcdir)/$$file"; \
-+	  ln $$file $(distdir) 2> /dev/null \
-+	    || cp -p $$file $(distdir); \
-+	done
-+
-+update-po: Makefile
-+	$(MAKE) $(GETTEXT_PACKAGE).pot
-+	tmpdir=`pwd`; \
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  echo "$$lang:"; \
-+	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-+	  if $$result; then \
-+	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-+	      rm -f $$tmpdir/$$lang.new.po; \
-+            else \
-+	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-+	        :; \
-+	      else \
-+	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-+	        rm -f $$tmpdir/$$lang.new.po; \
-+	        exit 1; \
-+	      fi; \
-+	    fi; \
-+	  else \
-+	    echo "msgmerge for $$lang.gmo failed!"; \
-+	    rm -f $$tmpdir/$$lang.new.po; \
-+	  fi; \
-+	done
-+
-+Makefile POTFILES: stamp-it
-+	@if test ! -f $@; then \
-+	  rm -f stamp-it; \
-+	  $(MAKE) stamp-it; \
-+	fi
-+
-+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-+	       $(SHELL) ./config.status
-+
-+# Tell versions [3.59,3.63) of GNU make not to export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -up libgweather-2.91.0/po-locations/POTFILES.in.gettext libgweather-2.91.0/po-locations/POTFILES.in
---- libgweather-2.91.0/po-locations/POTFILES.in.gettext	2011-01-30 13:51:19.618635028 -0500
-+++ libgweather-2.91.0/po-locations/POTFILES.in	2011-01-30 13:51:19.618635028 -0500
-@@ -0,0 +1,4 @@
-+# This list should contain *only* data/Locations.xml.in.
-+# Everything else should be in POTFILES.skip.
-+[encoding:UTF-8]
-+data/Locations.xml.in
diff --git a/testing/libgweather/libgweather.install b/testing/libgweather/libgweather.install
deleted file mode 100644
index 7062d4167..000000000
--- a/testing/libgweather/libgweather.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=libgweather
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-}
diff --git a/testing/libimobiledevice/PKGBUILD b/testing/libimobiledevice/PKGBUILD
deleted file mode 100644
index d49c92fc7..000000000
--- a/testing/libimobiledevice/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 109895 2011-02-13 16:49:33Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=libimobiledevice
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
-url="http://libimobiledevice.org/"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2' 'LGPL2.1')
-depends=('gnutls'  'glib2' 'libplist' 'usbmuxd')
-makedepends=('swig' 'python2')
-options=('!libtool')
-source=(http://libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2
-        swig-version-check.patch)
-md5sums=('b38bb70a41538a2ad593b0779651a636'
-         '8bb215e36fe0e08a72332c108c7842cc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # SWIG version check is wrong (still not fixed upstream)
-  patch -p1 -i "$srcdir"/swig-version-check.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libimobiledevice/swig-version-check.patch b/testing/libimobiledevice/swig-version-check.patch
deleted file mode 100644
index c56b095db..000000000
--- a/testing/libimobiledevice/swig-version-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure
---- libimobiledevice-1.0.3.old/configure	2010-10-04 07:38:37.000000000 -0700
-+++ libimobiledevice-1.0.3/configure	2010-10-08 05:43:05.466686656 -0700
-@@ -3477,9 +3477,7 @@
-                         if test -z "$available_patch" ; then
-                                 available_patch=0
-                         fi
--                        if test $available_major -ne $required_major \
--                                -o $available_minor -ne $required_minor \
--                                -o $available_patch -lt $required_patch ; then
-+                        if test $available_major -lt $required_major ; then
-                                 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&5
- $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&2;}
-                                 SWIG=false
diff --git a/testing/liblrdf/PKGBUILD b/testing/liblrdf/PKGBUILD
deleted file mode 100644
index 0bd976da0..000000000
--- a/testing/liblrdf/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 110602 2011-02-20 15:55:20Z andyrtr $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=liblrdf
-pkgver=0.4.0
-pkgrel=7
-pkgdesc="A library for the manipulation of RDF file in LADSPA plugins"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/lrdf"
-depends=('raptor1' 'ladspa')
-makedepends=('pkgconfig')
-license=('GPL')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/lrdf/${pkgname}-${pkgver}.tar.gz
-	md5.patch)
-groups=('ladspa-plugins')
-md5sums=('327a5674f671c4b360c6353800226877'
-         'a6d231d052dc188cbc4c1039cf3a2003')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/md5.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/liblrdf/md5.patch b/testing/liblrdf/md5.patch
deleted file mode 100644
index 1c43b12e9..000000000
--- a/testing/liblrdf/md5.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- liblrdf-0.4.0.orig/src/lrdf_md5.h
-+++ liblrdf-0.4.0/src/lrdf_md5.h
-@@ -32,6 +32,15 @@
- #ifndef __MD5_H__
- #define __MD5_H__
-
-+/* Change function names to prevent symbol conflicts */
-+#define md5_init _lrdf_md5_init
-+#define md5_buffer _lrdf_md5_buffer
-+#define md5_sig_from_string _lrdf_md5_sig_from_string
-+#define md5_finish _lrdf_md5_finish
-+#define md5_process _lrdf_md5_process
-+#define md5_sig_to_string _lrdf_md5_sig_to_string
-+#define md5_get_result _lrdf_md5_get_result
-+
- /*
-  * Size of a standard MD5 signature in bytes.  This definition is for
-  * external programs only.  The MD5 routines themselves reference the
diff --git a/testing/libnice/PKGBUILD b/testing/libnice/PKGBUILD
deleted file mode 100644
index 97e10f729..000000000
--- a/testing/libnice/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 500 2009-08-01 11:44:28Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: William Díaz <wdiaz@archlinux.us>
-
-pkgname=libnice
-pkgver=0.1.0
-pkgrel=1
-pkgdesc="An implementation of the IETF's draft ICE (for p2p UDP data streams)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://nice.freedesktop.org"
-license=('LGPL')
-depends=('gstreamer0.10')
-options=('!libtool')
-source=(http://nice.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-md5sums=('c077e2aa74c9afb4b4e157efc8a6ad9d')
-
-build() {
-#  export CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/libnotify/PKGBUILD b/testing/libnotify/PKGBUILD
deleted file mode 100644
index e67352204..000000000
--- a/testing/libnotify/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 115920 2011-03-22 14:03:02Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libnotify
-pkgver=0.7.2
-pkgrel=1
-pkgdesc="Desktop notification library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://library.gnome.org/devel/notification-spec/"
-license=('LGPL')
-depends=('gdk-pixbuf2')
-makedepends=('gtk3' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9b6a8459401e4af3da9cbc9e35a58d1a977273d3fe898d4a00a888f4191b85d6')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure --prefix=/usr --disable-static
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libpeas/PKGBUILD b/testing/libpeas/PKGBUILD
deleted file mode 100644
index 8e190cea6..000000000
--- a/testing/libpeas/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 117856 2011-04-04 20:18:31Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-pkgname=libpeas
-pkgver=1.0.0
-pkgrel=1
-pkgdesc="A GObject-based plugins engine"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('gtk3' 'hicolor-icon-theme' 'pygobject' 'gobject-introspection')
-makedepends=('gtk-doc' 'intltool' 'pygobject-devel')
-options=('!libtool')
-install=libpeas.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('b1482690565241baf3870311a77efb3f89a4335f48cb4ca31e8b8405220a8d99')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libpeas/libpeas.install b/testing/libpeas/libpeas.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/testing/libpeas/libpeas.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/librsvg/PKGBUILD b/testing/librsvg/PKGBUILD
deleted file mode 100644
index ddc574aa9..000000000
--- a/testing/librsvg/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 117525 2011-04-04 10:15:22Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=librsvg
-pkgver=2.34.0
-pkgrel=1
-pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL')
-depends=('gdk-pixbuf2' 'pango' 'libcroco')
-makedepends=('intltool')
-optdepends=('python2: rsvg commandline utility')
-options=('!libtool' '!emptydirs')
-url="http://librsvg.sourceforge.net/"
-install=librsvg.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.34/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9d2111e086dcffd12466f48ab1ca088654011684c499a4cc4676da918290f3cd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' rsvg.in
-  ./configure --prefix=/usr --libexecdir=/usr/lib/${pkgname} \
-      --with-croco --disable-static \
-      --with-svgz --disable-gtk-theme
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/librsvg/librsvg.install b/testing/librsvg/librsvg.install
deleted file mode 100644
index 4d48b071f..000000000
--- a/testing/librsvg/librsvg.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/gdk-pixbuf-query-loaders --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/libsocialweb/PKGBUILD b/testing/libsocialweb/PKGBUILD
deleted file mode 100644
index fb2c9cbde..000000000
--- a/testing/libsocialweb/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 120409 2011-04-23 20:56:42Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-pkgname=libsocialweb
-pkgver=0.25.16
-pkgrel=1
-pkgdesc="A personal social data server"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring'
-         'json-glib')
-makedepends=('intltool' 'gtk-doc')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('2726c29c5e334294df81d2d57c750ed86866c64a6b0e14eae7f8c7cc7b033064')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/libsocialweb \
-    --enable-all-services=yes \
-    --with-online=always
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libsoup/PKGBUILD b/testing/libsoup/PKGBUILD
deleted file mode 100644
index 901438de5..000000000
--- a/testing/libsoup/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 120683 2011-04-25 23:06:22Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libsoup
-pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.34.1
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
-options=('!libtool' '!emptydirs')
-sha256sums=('a2f846af2c4c08e15eacc9879c8c9be4d85f8105f960f96a9ba3dbabd9ee517b')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package_libsoup() {
-  pkgdesc="GNOME HTTP Library - base library"
-  depends=('glib2' 'libxml2' 'glib-networking')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}"/usr/lib/libsoup-gnome-2.4.*
-  rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-gnome-2.4.pc"
-  rm -rf "${pkgdir}/usr/include/libsoup-gnome-2.4"
-  rm -f "${pkgdir}/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib"
-}
-
-package_libsoup-gnome() {
-  pkgdesc="GNOME HTTP Library - GNOME libraries"
-  depends=("libsoup=${pkgver}" 'libgnome-keyring')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}"/usr/lib/libsoup-2.4.*
-  rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-2.4.pc"
-  rm -rf "${pkgdir}/usr/include/libsoup-2.4"
-  rm -rf "${pkgdir}/usr/share"
-  rm -f "${pkgdir}/usr/lib/girepository-1.0/Soup-2.4.typelib"
-}
diff --git a/testing/libunique/PKGBUILD b/testing/libunique/PKGBUILD
deleted file mode 100644
index a03262a99..000000000
--- a/testing/libunique/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 109868 2011-02-13 14:14:02Z heftig $
-# Maintainer: Jan de Groot  <jgc@archlinux.org>
-pkgname=libunique
-pkgver=1.1.6
-pkgrel=4
-pkgdesc="Library for writing single instance applications"
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-depends=('gtk2')
-makedepends=('gtk-doc' 'gobject-introspection')
-options=('!libtool')
-url="http://live.gnome.org/LibUnique"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.1/${pkgname}-${pkgver}.tar.bz2
-        unique-gdbus.patch)
-sha256sums=('e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb'
-            'bf99ddbf9104502ea498a6812ec2d700f61f4dbbaa2471cd52174b0b27070769')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/unique-gdbus.patch"
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-dbus
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # Remove documentation, provided by libunique3
-  rm -r "$pkgdir/usr/share/gtk-doc"
-}
diff --git a/testing/libunique/unique-gdbus.patch b/testing/libunique/unique-gdbus.patch
deleted file mode 100644
index 880c0c0ff..000000000
--- a/testing/libunique/unique-gdbus.patch
+++ /dev/null
@@ -1,529 +0,0 @@
-From 01066039529c0181f231325476bb4823c16a2aea Mon Sep 17 00:00:00 2001
-From: Christian Persch <chpe@gnome.org>
-Date: Sat, 15 May 2010 17:47:45 +0000
-Subject: Add GDBus backend
-
-Add backend using GDBus, the new D-BUS binding in GIO 2.25.
-
-Bug #618723.
----
-diff --git a/configure.ac b/configure.ac
-index bc3163a..b6a4221 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -116,6 +116,19 @@ AS_IF([test "x$have_dbus" = "xyes"],
- 
- AM_CONDITIONAL([HAVE_DBUS], [test "x$have_dbus" = "xyes"])
- 
-+dnl GDBus backend
-+dnl This is the default backend if GIO is recent enough
-+m4_define([gdbus_gio_required],[2.25.7])
-+PKG_CHECK_MODULES([GDBUS],[gio-2.0 >= gdbus_gio_required],[have_gdbus=yes],[have_gdbus=no])
-+
-+AS_IF([test "x$have_gdbus" = "xyes"],
-+  [
-+    AC_DEFINE([HAVE_GDBUS],[1],[Define if GDBus backend is enabled])
-+  ]
-+  )
-+
-+AM_CONDITIONAL([HAVE_GDBUS],[test "$have_gdbus" = "yes"])
-+
- dnl Bacon backend
- dnl This is the fallback backend, so we *need* these headers and functions
- dnl even if we end up using D-Bus
-@@ -146,7 +159,13 @@ AM_CONDITIONAL([HAVE_BACON], [test "x$have_bacon" = "xyes"])
- 
- dnl Choose the default backend
- AC_MSG_CHECKING([for default IPC mechanism])
--AS_IF([test "x$have_dbus" = "xyes"],
-+AS_IF([test "x$have_gdbus" = "xyes"],
-+      [
-+        UNIQUE_DEFAULT_BACKEND=gdbus
-+        AC_MSG_RESULT([GDBus])
-+      ],
-+
-+      [test "x$have_dbus" = "xyes"],
-       [
-         UNIQUE_DEFAULT_BACKEND=dbus
-         AC_MSG_RESULT([D-Bus])
-@@ -243,6 +262,7 @@ AC_CONFIG_FILES([
-         unique/uniqueversion.h
-         unique/bacon/Makefile
-         unique/dbus/Makefile
-+        unique/gdbus/Makefile
-         tests/Makefile
-         po/Makefile.in
- ])
-@@ -261,6 +281,7 @@ Configuration:
- Backends:
-           Unix Domain Socket: $have_bacon
-                        D-BUS: $have_dbus
-+                       GDBus: $have_gdbus
- 
-              Default backend: $UNIQUE_DEFAULT_BACKEND
- "
-diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
-index 3172588..2c1dbf4 100644
---- a/doc/reference/Makefile.am
-+++ b/doc/reference/Makefile.am
-@@ -50,7 +50,8 @@ IGNORE_HFILES = \
- 	uniquemarshal.h \
- 	stamp-uniquemarshal.h \
- 	bacon \
--	dbus 
-+	dbus \
-+	gdbus
- 
- EXTRA_HFILES =
- 
-diff --git a/unique/Makefile.am b/unique/Makefile.am
-index 6475a87..8f0b7ba 100644
---- a/unique/Makefile.am
-+++ b/unique/Makefile.am
-@@ -12,7 +12,11 @@ if HAVE_DBUS
- SUBDIRS += dbus
- endif
- 
--DIST_SUBDIRS = bacon dbus
-+if HAVE_GDBUS
-+SUBDIRS += gdbus
-+endif
-+
-+DIST_SUBDIRS = bacon dbus gdbus
- 
- INCLUDES = -I$(top_srcdir)
- 
-@@ -72,6 +76,10 @@ if HAVE_DBUS
- unique_backend_libs += $(top_builddir)/unique/dbus/libunique-dbus.la
- endif
- 
-+if HAVE_GDBUS
-+unique_backend_libs += $(top_builddir)/unique/gdbus/libunique-gdbus.la
-+endif
-+
- uniquedir = $(includedir)/unique-1.0/unique
- unique_HEADERS = \
- 	$(unique_sources_h) 				\
-diff --git a/unique/gdbus/.gitignore b/unique/gdbus/.gitignore
-new file mode 100644
-index 0000000..c7e22c3
---- /dev/null
-+++ b/unique/gdbus/.gitignore
-@@ -0,0 +1,2 @@
-+libunique_gdbus_la-uniquebackend-gdbus.lo
-+libunique-gdbus.la
-diff --git a/unique/gdbus/Makefile.am b/unique/gdbus/Makefile.am
-new file mode 100644
-index 0000000..e10637d
---- /dev/null
-+++ b/unique/gdbus/Makefile.am
-@@ -0,0 +1,24 @@
-+include $(top_srcdir)/build/autotools/Makefile.am.silent
-+
-+noinst_LTLIBRARIES = libunique-gdbus.la
-+
-+libunique_gdbus_la_SOURCES = 	\
-+	uniquebackend-gdbus.h	\
-+	uniquebackend-gdbus.c
-+
-+libunique_gdbus_la_PPCFLAGS = \
-+	-DG_LOG_DOMAIN=\"Unique-GDBus\"	\
-+	-DG_DISABLE_SINGLE_INCLUDES	\
-+	-I$(top_srcdir)			\
-+	$(AM_CPPFLAGS)
-+
-+libunique_gdbus_la_CFLAGS =	\
-+	$(UNIQUE_CFLAGS)	\
-+	$(UNIQUE_DEBUG_CFLAGS)	\
-+	$(MAINTAINER_CFLAGS)	\
-+	$(GDBUS_CFLAGS)		\
-+	$(AM_CFLAGS)
-+
-+libunique_gdbus_la_LIBADD = \
-+	$(UNIQUE_LIBS) 	\
-+	$(GDBUS_LIBS)
-diff --git a/unique/gdbus/uniquebackend-gdbus.c b/unique/gdbus/uniquebackend-gdbus.c
-new file mode 100644
-index 0000000..14d54a9
---- /dev/null
-+++ b/unique/gdbus/uniquebackend-gdbus.c
-@@ -0,0 +1,303 @@
-+/* Unique - Single Instance application library
-+ * uniquebackend-gdbus.c: GDBus implementation of UniqueBackend
-+ *
-+ * Copyright (C) 2007  Emmanuele Bassi  <ebassi@o-hand.com>
-+ * Copyright © 2010 Christian Persch
-+ *
-+ * This library is free software; 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.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+ * 02110-1301 USA
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <gio/gio.h>
-+#include <gdk/gdk.h>
-+
-+#include "../uniqueinternals.h"
-+#include "uniquebackend-gdbus.h"
-+
-+struct _UniqueBackendGDBus
-+{
-+  UniqueBackend parent_instance;
-+
-+  GDBusConnection *connection;
-+  guint registration_id;
-+  guint owner_id;
-+  gboolean owns_name;
-+  GMainLoop *loop;
-+};
-+
-+struct _UniqueBackendGDBusClass
-+{
-+  UniqueBackendClass parent_class;
-+  GDBusNodeInfo *introspection_data;
-+};
-+
-+G_DEFINE_TYPE (UniqueBackendGDBus, unique_backend_gdbus, UNIQUE_TYPE_BACKEND);
-+
-+static const char introspection_xml[] =
-+  "<node name='/'>"
-+    "<interface name='org.gtk.UniqueApp'>"
-+      "<method name='SendMessage'>"
-+        "<arg name='command' type='s' direction='in'/>"
-+        "<arg name='message' type='(suuus)' direction='in'/>"
-+        "<arg name='time' type='u' direction='in'/>"
-+        "<arg name='response' type='s' direction='out'/>"
-+      "</method>"
-+    "</interface>"
-+  "</node>";
-+
-+static void
-+method_call_cb (GDBusConnection       *connection,
-+                const gchar           *sender,
-+                const gchar           *object_path,
-+                const gchar           *interface_name,
-+                const gchar           *method_name,
-+                GVariant              *parameters,
-+                GDBusMethodInvocation *invocation,
-+                gpointer               user_data)
-+{
-+  if (g_strcmp0 (interface_name, "org.gtk.UniqueApp") != 0 ||
-+      g_strcmp0 (object_path, "/Factory") != 0)
-+    return;
-+
-+  if (g_strcmp0 (method_name, "SendMessage") == 0)
-+    {
-+      UniqueBackend *backend = UNIQUE_BACKEND (user_data);
-+      const gchar *command_str, *data, *startup_id;
-+      guint len, screen_num, workspace, time_;
-+      UniqueMessageData message_data;
-+      gint command;
-+      UniqueResponse response;
-+      GdkDisplay *display;
-+
-+      g_variant_get (parameters,
-+                     "(&s(&suuu&s)u)",
-+                     &command_str,
-+                     &data, &len, &screen_num, &workspace, &startup_id,
-+                     &time_);
-+
-+      command = unique_command_from_string (backend->parent, command_str);
-+      if (command == 0)
-+        {
-+          g_dbus_method_invocation_return_error (invocation,
-+                                                 G_DBUS_ERROR,
-+                                                 G_DBUS_ERROR_INVALID_ARGS,
-+                                                 "Invalid command `%s' received",
-+                                                 command_str);
-+          return;
-+        }
-+
-+      display = gdk_display_get_default ();
-+
-+      message_data.data = len > 0 ? (guchar *) data : NULL;
-+      message_data.length = (gint) len;
-+      message_data.workspace = workspace;
-+      message_data.startup_id = (char *) startup_id;
-+      if (screen_num >= 0 && screen_num < gdk_display_get_n_screens (display))
-+        message_data.screen = gdk_display_get_screen (display, screen_num);
-+      else
-+        message_data.screen = gdk_screen_get_default ();
-+
-+      response = unique_app_emit_message_received (backend->parent, command, &message_data, time_);
-+
-+      g_dbus_method_invocation_return_value (invocation,
-+                                             g_variant_new ("(s)", unique_response_to_string (response)));
-+      return;
-+    }
-+}
-+
-+static void
-+name_acquired_cb (GDBusConnection *connection,
-+                  const gchar     *name,
-+                  gpointer         user_data)
-+{
-+  UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (user_data);
-+
-+  backend_gdbus->owns_name = TRUE;
-+  if (backend_gdbus->loop && g_main_loop_is_running (backend_gdbus->loop))
-+    g_main_loop_quit (backend_gdbus->loop);
-+}
-+
-+static void
-+name_lost_cb (GDBusConnection *connection,
-+              const gchar     *name,
-+              gpointer         user_data)
-+{
-+  UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (user_data);
-+
-+  backend_gdbus->owns_name = FALSE;
-+  if (backend_gdbus->loop && g_main_loop_is_running (backend_gdbus->loop))
-+    g_main_loop_quit (backend_gdbus->loop);
-+}
-+
-+static const GDBusInterfaceVTable interface_vtable = {
-+  method_call_cb,
-+  NULL,
-+  NULL
-+};
-+
-+static gboolean
-+unique_backend_gdbus_request_name (UniqueBackend *backend)
-+{
-+  UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (backend);
-+  UniqueBackendGDBusClass *klass = UNIQUE_BACKEND_GDBUS_GET_CLASS (backend);
-+  GError *error;
-+
-+  error = NULL;
-+  backend_gdbus->connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
-+  if (!backend_gdbus->connection)
-+    {
-+      g_warning ("Unable to open a connection to the session bus: %s",
-+                 error->message);
-+      g_error_free (error);
-+
-+      return FALSE;
-+    }
-+
-+  backend_gdbus->registration_id =
-+      g_dbus_connection_register_object (backend_gdbus->connection,
-+                                         "/Factory",
-+                                         klass->introspection_data->interfaces[0],
-+                                         &interface_vtable,
-+                                         backend, NULL,
-+                                         &error);
-+  if (backend_gdbus->registration_id == 0)
-+    {
-+      g_warning ("Unable to register object with the session bus: %s",
-+                 error->message);
-+      g_error_free (error);
-+
-+      return FALSE;
-+    }
-+
-+  backend_gdbus->owns_name = FALSE;
-+
-+  backend_gdbus->owner_id =
-+      g_bus_own_name_on_connection (backend_gdbus->connection,
-+                                    unique_backend_get_name (backend),
-+                                    G_BUS_NAME_OWNER_FLAGS_NONE,
-+                                    name_acquired_cb,
-+                                    name_lost_cb,
-+                                    backend, NULL);
-+
-+  backend_gdbus->loop = g_main_loop_new (NULL, FALSE);
-+  g_main_loop_run (backend_gdbus->loop);
-+  g_main_loop_unref (backend_gdbus->loop);
-+  backend_gdbus->loop = NULL;
-+
-+  return backend_gdbus->owns_name;
-+}
-+
-+static UniqueResponse
-+unique_backend_gdbus_send_message (UniqueBackend     *backend,
-+                                   gint               command,
-+                                   UniqueMessageData *message_data,
-+                                   guint              time_)
-+{
-+  UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (backend);
-+  GVariantBuilder builder;
-+  GVariant *result;
-+  const gchar *command_str, *resp;
-+  UniqueResponse response;
-+  GError *error;
-+
-+  command_str = unique_command_to_string (backend->parent, command);
-+
-+  g_variant_builder_init (&builder, G_VARIANT_TYPE ("(s(suuus)u)"));
-+  g_variant_builder_add (&builder, "s", command_str ? command_str : "");
-+  g_variant_builder_open (&builder, G_VARIANT_TYPE ("(suuus)"));
-+  g_variant_builder_add (&builder, "s", message_data->data ? (char *) message_data->data : "");
-+  g_variant_builder_add (&builder, "u", (guint) message_data->length);
-+  g_variant_builder_add (&builder, "u", (guint) gdk_screen_get_number (message_data->screen));
-+  g_variant_builder_add (&builder, "u", (guint) message_data->workspace);
-+  g_variant_builder_add (&builder, "s", message_data->startup_id ? message_data->startup_id : "");
-+  g_variant_builder_close (&builder);
-+  g_variant_builder_add (&builder, "u", time_);
-+
-+  error = NULL;
-+  result = g_dbus_connection_call_sync (backend_gdbus->connection,
-+                                        unique_backend_get_name (backend),
-+                                        "/Factory",
-+                                        "org.gtk.UniqueApp",
-+                                        "SendMessage",
-+                                        g_variant_builder_end (&builder),
-+                                        G_VARIANT_TYPE ("(s)"),
-+                                        G_DBUS_CALL_FLAGS_NO_AUTO_START,
-+                                        -1,
-+                                        NULL,
-+                                        &error);
-+  if (error)
-+    {
-+      g_warning ("Error while sending message: %s", error->message);
-+      g_error_free (error);
-+      
-+      return UNIQUE_RESPONSE_INVALID;
-+    }
-+
-+  g_variant_get (result, "(&s)", &resp);
-+  response = unique_response_from_string (resp);
-+  g_variant_unref (result);
-+
-+  return response;
-+}
-+
-+static void
-+unique_backend_gdbus_dispose (GObject *gobject)
-+{
-+  UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (gobject);
-+
-+  if (backend_gdbus->owner_id != 0)
-+    {
-+      g_bus_unown_name (backend_gdbus->owner_id);
-+      backend_gdbus->owner_id = 0;
-+    }
-+  if (backend_gdbus->registration_id != 0)
-+    {
-+      g_assert (backend_gdbus->connection != NULL);
-+      g_dbus_connection_unregister_object (backend_gdbus->connection,
-+                                           backend_gdbus->registration_id);
-+      backend_gdbus->registration_id = 0;
-+    }
-+  if (backend_gdbus->connection)
-+    {
-+      g_object_unref (backend_gdbus->connection);
-+      backend_gdbus->connection = NULL;
-+    }
-+
-+  G_OBJECT_CLASS (unique_backend_gdbus_parent_class)->dispose (gobject);
-+}
-+
-+static void
-+unique_backend_gdbus_class_init (UniqueBackendGDBusClass *klass)
-+{
-+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-+  UniqueBackendClass *backend_class = UNIQUE_BACKEND_CLASS (klass);
-+
-+  gobject_class->dispose = unique_backend_gdbus_dispose;
-+
-+  backend_class->request_name = unique_backend_gdbus_request_name;
-+  backend_class->send_message = unique_backend_gdbus_send_message;
-+
-+  klass->introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL);
-+  g_assert (klass->introspection_data != NULL);
-+}
-+
-+static void
-+unique_backend_gdbus_init (UniqueBackendGDBus *backend)
-+{
-+}
-diff --git a/unique/gdbus/uniquebackend-gdbus.h b/unique/gdbus/uniquebackend-gdbus.h
-new file mode 100644
-index 0000000..41eb6e5
---- /dev/null
-+++ b/unique/gdbus/uniquebackend-gdbus.h
-@@ -0,0 +1,43 @@
-+/* Unique - Single Instance application library
-+ * uniquebackend-gdbus.c: GDBus implementation of UniqueBackend
-+ *
-+ * Copyright (C) 2007  Emmanuele Bassi  <ebassi@o-hand.com>
-+ *
-+ * This library is free software; 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.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+ * 02110-1301 USA
-+ */
-+
-+#ifndef __UNIQUE_BACKEND_GDBUS_H__
-+#define __UNIQUE_BACKEND_GDBUS_H__
-+
-+#include <unique/uniquebackend.h>
-+
-+G_BEGIN_DECLS
-+
-+#define UNIQUE_TYPE_BACKEND_GDBUS                (unique_backend_gdbus_get_type ())
-+#define UNIQUE_BACKEND_GDBUS(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNIQUE_TYPE_BACKEND_GDBUS, UniqueBackendGDBus))
-+#define UNIQUE_IS_BACKEND_GDBUS(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNIQUE_TYPE_BACKEND_GDBUS))
-+#define UNIQUE_BACKEND_GDBUS_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), UNIQUE_TYPE_BACKEND_GDBUS, UniqueBackendGDBusClass))
-+#define UNIQUE_IS_BACKEND_GDBUS_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), UNIQUE_TYPE_BACKEND_GDBUS))
-+#define UNIQUE_BACKEND_GDBUS_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), UNIQUE_TYPE_BACKEND_GDBUS, UniqueBackendGDBusClass))
-+
-+typedef struct _UniqueBackendGDBus       UniqueBackendGDBus;
-+typedef struct _UniqueBackendGDBusClass  UniqueBackendGDBusClass;
-+
-+GType unique_backend_gdbus_get_type (void) G_GNUC_CONST;
-+
-+G_END_DECLS
-+
-+#endif /* __UNIQUE_BACKEND_GDBUS_H__ */
-diff --git a/unique/uniquebackend.c b/unique/uniquebackend.c
-index 18a0c45..a76e42e 100644
---- a/unique/uniquebackend.c
-+++ b/unique/uniquebackend.c
-@@ -298,6 +298,9 @@ unique_backend_send_message (UniqueBackend     *backend,
- #ifdef HAVE_DBUS
- #include "dbus/uniquebackend-dbus.h"
- #endif
-+#ifdef HAVE_GDBUS
-+#include "gdbus/uniquebackend-gdbus.h"
-+#endif
- 
- /**
-  * unique_backend_create:
-@@ -329,6 +332,10 @@ unique_backend_create (void)
-       if (strcmp (backend_name, "dbus") == 0)
-         backend_gtype = unique_backend_dbus_get_type ();
- #endif /* HAVE_DBUS */
-+#ifdef HAVE_GDBUS
-+      if (strcmp (backend_name, "gdbus") == 0)
-+        backend_gtype = unique_backend_gdbus_get_type ();
-+#endif /* HAVE_GDBUS */
- #if !defined(HAVE_BACON) && !defined(HAVE_DBUS)
- #error Need either bacon or dbus
- #endif 
---
-cgit v0.8.3.1
diff --git a/testing/libunique3/PKGBUILD b/testing/libunique3/PKGBUILD
deleted file mode 100644
index 05e5af46e..000000000
--- a/testing/libunique3/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 117940 2011-04-04 22:13:19Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-pkgname=libunique3
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Library for writing single instance applications for GTK3"
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-depends=('gtk3')
-makedepends=('gtk-doc' 'gobject-introspection')
-options=('!libtool')
-url="http://live.gnome.org/LibUnique"
-source=(http://ftp.gnome.org/pub/gnome/sources/libunique/${pkgver%.*}/libunique-${pkgver}.tar.bz2)
-sha256sums=('e945ff3d3bb7d4085ed73b5418f2935097bb0afc07287739c8f0d6fc049202e1')
-
-build() {
-  cd "${srcdir}/libunique-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-dbus
-  make
-}
-
-package() {
-  cd "${srcdir}/libunique-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libwebkit/PKGBUILD b/testing/libwebkit/PKGBUILD
deleted file mode 100644
index d2b541f1e..000000000
--- a/testing/libwebkit/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 121025 2011-04-27 21:44:28Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=libwebkit
-pkgname=(libwebkit libwebkit3)
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="An opensource web content engine"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://webkitgtk.org/"
-license=('custom')
-depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant')
-makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
-options=('!libtool')
-install=libwebkit.install
-source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz gcc46.patch)
-md5sums=('10c969db3b5484c71df1aa9a338377ff'
-         '970a2fa91b9827dff8e9b9edb4867701')
-
-build() {
-  cd "${srcdir}/webkit-${pkgver}"
-  patch -Np1 -i "${srcdir}/gcc46.patch"
-  mkdir build-gtk{2,3}
-
-  ( cd build-gtk2 && _build --with-gtk=2.0 )
-  ( cd build-gtk3 && _build --with-gtk=3.0 )
-}
-
-_build() {
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --with-font-backend=freetype --enable-gtk-doc \
-    --with-unicode-backend=icu \
-    --enable-spellcheck "$@"
-  make all stamp-po
-}
-
-package_libwebkit() {
-  pkgdesc+=" (for GTK2)"
-  depends+=(gtk2)
-  provides=('webkitgtk-svn')
-  conflicts=('webkitgtk-svn')
-  replaces=('webkitgtk-svn')
-
-  cd "$srcdir/webkit-$pkgver/build-gtk2"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit/LICENSE"
-}
-
-package_libwebkit3() {
-  pkgdesc+=" (for GTK3)"
-  depends+=(gtk3)
-
-  cd "${srcdir}/webkit-${pkgver}/build-gtk3"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit3/LICENSE"
-}
diff --git a/testing/libwebkit/gcc46.patch b/testing/libwebkit/gcc46.patch
deleted file mode 100644
index befd892d4..000000000
--- a/testing/libwebkit/gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: trunk/Source/WebCore/dom/make_names.pl
-===================================================================
---- trunk/Source/WebCore/dom/make_names.pl	(revision 73989)
-+++ trunk/Source/WebCore/dom/make_names.pl	(revision 84123)
-@@ -66,5 +66,5 @@
-     $gccLocation = "/usr/bin/gcc";
- }
--my $preprocessor = $gccLocation . " -E -P -x c++";
-+my $preprocessor = $gccLocation . " -E -x c++";
- 
- GetOptions(
diff --git a/testing/libwebkit/libwebkit.install b/testing/libwebkit/libwebkit.install
deleted file mode 100644
index 24072f316..000000000
--- a/testing/libwebkit/libwebkit.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/libwnck/PKGBUILD b/testing/libwnck/PKGBUILD
deleted file mode 100644
index dd3fa4a1e..000000000
--- a/testing/libwnck/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 109642 2011-02-11 16:58:51Z ibiru $
-# Maintainer: Jan de Groot  <jgc@archlinux.org>
-pkgname=libwnck
-pkgver=2.30.6
-pkgrel=2
-pkgdesc="Window Navigator Construction Kit"
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-depends=('gtk2' 'startup-notification' 'libxres')
-makedepends=('libxt' 'intltool' 'gobject-introspection')
-options=('!libtool')
-url="http://www.gnome.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4d25984ed5cfe215eb650f960de634300a6cafc9d98bbc7caea8043b7cd96cc5')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --localstatedir=/var --disable-static
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-
-    #The binaries are shipped in libwnck3
-    rm -f ${pkgdir}/usr/bin/wnckprop
-    rm -f ${pkgdir}/usr/bin/wnck-urgency-monitor
-}
diff --git a/testing/libwnck3/PKGBUILD b/testing/libwnck3/PKGBUILD
deleted file mode 100644
index 25e88caee..000000000
--- a/testing/libwnck3/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 117893 2011-04-04 21:09:31Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=libwnck3
-_pkgbasename=libwnck
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Window Navigator Construction Kit (GTK+3)"
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-depends=('gtk3' 'startup-notification' 'libxres')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-url="http://www.gnome.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2)
-sha256sums=('bc34093ad185bb5086e97226f36157a6dd205623d32bdef71261a8b248a41f15')
-
-build() {
-    cd "${srcdir}/${_pkgbasename}-${pkgver}"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --localstatedir=/var --disable-static
-    make
-}
-
-package() {
-    cd "${srcdir}/${_pkgbasename}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libxklavier/PKGBUILD b/testing/libxklavier/PKGBUILD
deleted file mode 100644
index 1779f53c5..000000000
--- a/testing/libxklavier/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 109917 2011-02-13 20:31:57Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@archlinux.org>
-
-pkgname=libxklavier
-pkgver=5.1
-pkgrel=1
-pkgdesc="High-level API for X Keyboard Extension"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL')
-depends=('glib2' 'libxkbfile' 'libxml2' 'xkeyboard-config' 'libxi' 'iso-codes')
-makedepends=('pkgconfig')
-options=('!libtool' '!emptydirs')
-url="http://gswitchit.sourceforge.net"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1d7e8a6ed842d415d2f95b827e7d04ecf515ed5be2aaee262a8dd1c5cbe10ff1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-      --with-xkb-base=/usr/share/X11/xkb --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libxml++/PKGBUILD b/testing/libxml++/PKGBUILD
deleted file mode 100644
index 53566fd25..000000000
--- a/testing/libxml++/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 120095 2011-04-19 21:39:40Z ibiru $
-# Maintainer: damir <damir@archlinux.org>
-
-pkgbase=libxml++
-pkgname=('libxml++' 'libxml++-docs')
-pkgver=2.34.1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://libxmlplusplus.sourceforge.net/"
-makedepends=('pkgconfig' 'glibmm-docs' 'libxml2' 'glibmm')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.34/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('664f3636c425554bf5e7d1b60253244e2d723899be8a971fc54332148bfce040')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package_libxml++() {
-  pkgdesc="C++ bindings to libxml2"
-  depends=('libxml2' 'glibmm')
-  replaces=('libxml++2')
-  provides=("libxml++2=${pkgver}")
-  conflicts=('libxml++2')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i -e 's/install-data-am: install-data-local install-dist_referenceDATA/install-data-am: /' Makefile
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libxml++-docs() {
-  pkgdesc="Developer documentation for libxml++"
-  depends=('glibmm-docs')
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install-data-local install-dist_referenceDATA
-}
diff --git a/testing/liferea/PKGBUILD b/testing/liferea/PKGBUILD
deleted file mode 100644
index d0c7602c7..000000000
--- a/testing/liferea/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 118815 2011-04-08 03:03:14Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=liferea
-pkgver=1.6.5
-pkgrel=3
-pkgdesc="A desktop news aggregator for online news feeds and weblogs"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://liferea.sourceforge.net/"
-license=('GPL')
-depends=('gconf' 'libwebkit' 'libxslt' 'libglade' 'sqlite3' 'hicolor-icon-theme')
-makedepends=('pkg-config' 'intltool' 'lua' 'libnotify')
-optdepends=('lua: for lua scripting support'
-            'libnotify: for notification support')
-options=('!libtool' '!emptydirs')
-install=liferea.install
-source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
-        libnotify-0.7.patch)
-md5sums=('b5a2c0803eec5d0aff0b9ca4114eaf16'
-         'fca97e3316c1c51e0179c4c7dcce47a2')
-sha1sums=('f24dbd0e81c5a8309f0d19853211fc02ff818477'
-          '52e53dd11a0ffe62304c4f17e80bfe1412cfbf29')
-
-build() {
-  cd "${srcdir}/liferea-${pkgver}"
-  patch -Np1 -i "$srcdir/libnotify-0.7.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install
-  make
-}
-
-package() {
-  cd "${srcdir}/liferea-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  
-  install -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/liferea/libnotify-0.7.patch b/testing/liferea/libnotify-0.7.patch
deleted file mode 100644
index 6dbbffb87..000000000
--- a/testing/liferea/libnotify-0.7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -u -Nr liferea-1.6.5/src/notification/libnotify.c liferea-1.6.5-libnotify/src/notification/libnotify.c
---- liferea-1.6.5/src/notification/libnotify.c	2009-06-20 20:33:19.000000000 +0200
-+++ liferea-1.6.5-libnotify/src/notification/libnotify.c	2011-03-06 23:53:45.783336455 +0100
-@@ -150,7 +150,7 @@
- //		notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL);
- //		notify_notification_clear_actions(n);
- 
--		n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL);
-+		n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL);
- 
- 		notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p));
- 
-@@ -244,7 +244,7 @@
- 
- 	labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), 
- 	                                  node_get_title (node), item_count);
--	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL);
-+	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL);
- 	g_free(labelSummary_p);
- 
- 	notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
diff --git a/testing/liferea/liferea.install b/testing/liferea/liferea.install
deleted file mode 100644
index 7d812ccdb..000000000
--- a/testing/liferea/liferea.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=liferea
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/mail-notification/PKGBUILD b/testing/mail-notification/PKGBUILD
deleted file mode 100644
index f4a978457..000000000
--- a/testing/mail-notification/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 119734 2011-04-14 10:44:43Z jgc $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=mail-notification
-pkgver=5.4
-pkgrel=8
-pkgdesc="Tray icon application that informs you if you have new mail"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.nongnu.org/mailnotify/"
-license=('GPL3' 'FDL')
-depends=('cyrus-sasl-plugins' 'gmime' 'libnotify>=0.7.1' 'gnome-keyring' 'hicolor-icon-theme' 'notification-daemon' 'libgnome')
-makedepends=('gob2' 'intltool' 'evolution' 'gnome-doc-utils')
-options=('!libtool' '!emptydirs')
-install=mail-notification.install
-source=(http://savannah.nongnu.org/download/mailnotify/${pkgname}-${pkgver}.tar.bz2
-        dont-update-cache.patch
-        remove-ubuntu-special-case.patch
-        mail-notification-5.4-evolution.patch
-        gmime-2.4.patch
-        mail-notification-5.4-sasl_encode64.patch
-        mail-notification-5.4-evolution-gtkhtml.patch
-        mail-notification-5.4-camel_headers.patch
-        mail-notification-5.4-icons.patch
-        mail-notification-5.4-weak.patch
-        mail-notification-5.4-popup-attach.patch
-        mail-notification-5.4-kde-trayicon.patch
-        mail-notification-5.4-evolution-3-0-support.patch
-        mail-notification-5.4-gtk3-support.patch
-        mail-notification-5.4-add-fallback-icon.patch)
-md5sums=('c8dc33a61251acb5474e56eab6b18f43'
-         '6007bc30e789dab0a8282038e0335eb9'
-         '9cadd61bbd9c324b2916ec980231e0f2'
-         'aa6f80820899f904c25988772f70ade9'
-         '447cc20f035b9cf1a391027684ce1297'
-         '125513ed059f62469377eb0ab794dbed'
-         'c595a3962ab13a65be24a941e28faa9c'
-         'f79939f593b2e8659e302df72c2b54b1'
-         '244b7ef2aec7656e8df390be87c10e2b'
-         '31bde95dfd39449959d8b3316f91429c'
-         'cdead6a88d1779f69a5f40dc75d5cb84'
-         'c7991b831834724eddc1c6802c3e06a6'
-         '49fe910f68393b0f6a1f1bcb7a8bdcd3'
-         '55ed1aeb56ca053cc1a0a6062761c2b4'
-         '09df61b4dc29c676ac81ff9054e840ac')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np0 -i "${srcdir}/dont-update-cache.patch"
-  patch -Np0 -i "${srcdir}/remove-ubuntu-special-case.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-evolution.patch"
-  patch -Np1 -i "${srcdir}/gmime-2.4.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-sasl_encode64.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-evolution-gtkhtml.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-camel_headers.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-icons.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-weak.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-popup-attach.patch"
-  patch -Np1 -i "${srcdir}/mail-notification-5.4-kde-trayicon.patch"
-  patch -Np0 -i "${srcdir}/mail-notification-5.4-evolution-3-0-support.patch"
-  patch -Np0 -i "${srcdir}/mail-notification-5.4-gtk3-support.patch"
-  patch -Np0 -i "${srcdir}/mail-notification-5.4-add-fallback-icon.patch"
-
-  gtk-builder-convert ui/mailbox-properties-dialog.glade ui/mailbox-properties-dialog.ui
-  gtk-builder-convert ui/properties-dialog.glade ui/properties-dialog.ui
-
-  ./jb configure prefix=/usr sysconfdir=/etc \
-      localstatedir=/var destdir="${pkgdir}" \
-      gconf-schemas-dir=/etc/gconf/schemas install-gconf-schemas=no \
-      cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \
-      library-mode=0755
-  ./jb build
-  GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 ./jb install
-
-  rm -f "${pkgdir}/usr/share/mail-notification/"*.glade
-  install -m644 ui/mailbox-properties-dialog.ui "${pkgdir}/usr/share/mail-notification/"
-  install -m644 ui/properties-dialog.ui "${pkgdir}/usr/share/mail-notification/"
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain mail-notification ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/mail-notification/dont-update-cache.patch b/testing/mail-notification/dont-update-cache.patch
deleted file mode 100644
index 81216835e..000000000
--- a/testing/mail-notification/dont-update-cache.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- jbsrc/jb.c.~1~	2008-03-20 16:53:02.000000000 +0100
-+++ jbsrc/jb.c	2008-03-26 20:51:45.641363619 +0100
-@@ -327,7 +327,6 @@
- jb_package_add_resources (void)
- {
-   JBGroup *group;
--  JBRule *rule;
-   JBObject *object;
- 
-   if (jb_variable_get_bool("compile-warnings"))
-@@ -362,11 +361,6 @@
-   if (jb_variable_get_bool("hotmail"))
-     jb_group_add_data_file(group, "hotmail.png", "$pkgdatadir");
- 
--  rule = jb_rule_new();
--  jb_rule_set_install_message(rule, "updating the GTK+ icon cache");
--  jb_rule_add_install_command(rule, "-gtk-update-icon-cache -f -t $datadir/icons/hicolor");
--  jb_group_add_resource(group, JB_GROUP_RESOURCE(rule));
--
-   jb_group_add(group);
- 
-   /*** data ******************************************************************/
diff --git a/testing/mail-notification/gmime-2.4.patch b/testing/mail-notification/gmime-2.4.patch
deleted file mode 100644
index 0d16357fb..000000000
--- a/testing/mail-notification/gmime-2.4.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c
---- mail-notification-5.4/build/src/mn-base-mbox-mailbox-backend.c	2008-12-23 14:48:49.000000000 +0300
-+++ mail-notification-5.4-OK/build/src/mn-base-mbox-mailbox-backend.c	2008-12-23 14:48:28.000000000 +0300
-@@ -265,7 +265,7 @@
- 	    mime_message = g_mime_parser_construct_message(parser);
- 	    if (mime_message)
- 	      {
--		if (g_mime_message_get_header(mime_message, "X-Mozilla-Status"))
-+		if (g_mime_object_get_header(mime_message, "X-Mozilla-Status"))
- 		  {
- #if WITH_MOZILLA
- 		    type = MN_TYPE_MOZILLA_MAILBOX_BACKEND;
-diff -Nrbu mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c
---- mail-notification-5.4/build/src/mn-mozilla-mailbox-backend.c	2008-12-23 14:48:49.000000000 +0300
-+++ mail-notification-5.4-OK/build/src/mn-mozilla-mailbox-backend.c	2008-12-23 14:46:47.000000000 +0300
-@@ -167,7 +167,7 @@
- 	
-     const char *header;
- 
--    header = g_mime_message_get_header(mime_message, header_name);
-+    header = g_mime_object_get_header(mime_message, header_name);
-     if (header && mn_str_ishex(header))
-       return strtol(header, NULL, 16);
-     else
-diff -Nrbu mail-notification-5.4/jbsrc/jb.c mail-notification-5.4-OK/jbsrc/jb.c
---- mail-notification-5.4/jbsrc/jb.c	2008-05-22 19:47:04.000000000 +0400
-+++ mail-notification-5.4-OK/jbsrc/jb.c	2008-12-23 14:43:09.000000000 +0300
-@@ -166,7 +166,7 @@
-   jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1");
-   jb_require_packages("D-Bus", "dbus", "dbus-glib-1");
- 
--  jb_check_packages_for_options("GMime", "gmime", "gmime-2.0 >= 2.2.7",
-+  jb_check_packages_for_options("GMime", "gmime", "gmime-2.4",
- 				"hotmail",
- 				"imap",
- 				"maildir",
-diff -Nrbu mail-notification-5.4/src/mn-message-mime.c mail-notification-5.4-OK/src/mn-message-mime.c
---- mail-notification-5.4/src/mn-message-mime.c	2008-05-22 19:45:35.000000000 +0400
-+++ mail-notification-5.4-OK/src/mn-message-mime.c	2008-12-23 14:46:35.000000000 +0300
-@@ -33,12 +33,12 @@
-   g_return_val_if_fail(GMIME_IS_MESSAGE(mime_message), FALSE);
- 
-   /* SpamAssassin */
--  spam = g_mime_message_get_header(mime_message, "X-Spam-Status");
-+  spam = g_mime_object_get_header(mime_message, "X-Spam-Status");
-   if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
-     return TRUE;
- 
-   /* bogofilter */
--  spam = g_mime_message_get_header(mime_message, "X-Bogosity");
-+  spam = g_mime_object_get_header(mime_message, "X-Bogosity");
-   if (spam && mn_ascii_str_case_has_prefix(spam, "yes"))
-     return TRUE;
- 
-@@ -89,7 +89,7 @@
-     {
-       const char *status;
- 
--      status = g_mime_message_get_header(mime_message, "Status");
-+      status = g_mime_object_get_header(mime_message, "Status");
-       if (status && strchr(status, 'R'))
- 	return NULL;		/* the message was read */
-       else if (status && strchr(status, 'O'))
diff --git a/testing/mail-notification/mail-notification-5.4-add-fallback-icon.patch b/testing/mail-notification/mail-notification-5.4-add-fallback-icon.patch
deleted file mode 100644
index 41c28e870..000000000
--- a/testing/mail-notification/mail-notification-5.4-add-fallback-icon.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/mn-stock.c.orig	2011-02-17 17:42:39.886767087 +0100
-+++ src/mn-stock.c	2011-02-17 17:49:37.415541177 +0100
-@@ -86,6 +86,13 @@
- 	  gtk_icon_source_set_icon_name(icon_source, icons[i].icon_name);
- 	  gtk_icon_set_add_source(icon_set, icon_source);
- 	  gtk_icon_source_free(icon_source);
-+
-+          /* Add a fallback icon */
-+          icon_source = gtk_icon_source_new();
-+          gtk_icon_source_set_icon_name(icon_source, "mail-notification");
-+          gtk_icon_source_set_state_wildcarded(icon_source, TRUE);
-+          gtk_icon_set_add_source(icon_set, icon_source);
-+          gtk_icon_source_free(icon_source);
- 	}
-       else if (icons[i].source_stock_id)
- 	{
diff --git a/testing/mail-notification/mail-notification-5.4-camel_headers.patch b/testing/mail-notification/mail-notification-5.4-camel_headers.patch
deleted file mode 100644
index 861e3d215..000000000
--- a/testing/mail-notification/mail-notification-5.4-camel_headers.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-evolution-message.c mail-notification-5.4-OK/build/src/mn-evolution-message.c
---- mail-notification-5.4/build/src/mn-evolution-message.c	2008-05-22 19:47:51.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-evolution-message.c	2010-05-04 18:13:31.000000000 +0400
-@@ -25,7 +25,7 @@
- #line 24 "src/mn-evolution-message.gob"
- 
- #include <glib/gi18n.h>
--#include <camel/camel-folder-summary.h>
-+#include <camel/camel.h>
- #include "mn-evolution-mailbox.h"
- #include "mn-message-private.h"
- #include "mn-evolution-client.h"
-diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notification-5.4-OK/build/src/mn-evolution-server.c
---- mail-notification-5.4/build/src/mn-evolution-server.c	2010-05-04 18:12:56.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-evolution-server.c	2010-05-04 18:13:39.000000000 +0400
-@@ -28,7 +28,7 @@
- #include <libintl.h>
- #include <gobject/gvaluecollector.h>
- #include <libedataserver/eds-version.h>
--#include <camel/camel-folder.h>
-+#include <camel/camel.h>
- #if EDS_CHECK_VERSION(2,29,0)
- #include <shell/e-shell.h>
- #include <mail/e-mail-browser.h>
-diff -Nrbu mail-notification-5.4/src/mn-evolution-plugin.c mail-notification-5.4-OK/src/mn-evolution-plugin.c
---- mail-notification-5.4/src/mn-evolution-plugin.c	2010-05-04 18:12:56.000000000 +0400
-+++ mail-notification-5.4-OK/src/mn-evolution-plugin.c	2010-05-04 18:13:20.000000000 +0400
-@@ -24,7 +24,7 @@
- #include <dbus/dbus.h>
- #include <dbus/dbus-glib-lowlevel.h>
- #include <dbus/dbus-glib-bindings.h>
--#include <camel/camel-folder.h>
-+#include <camel/camel.h>
- #include <mail/em-event.h>
- #include <mail/mail-tools.h>
- #include "mn-evolution.h"
diff --git a/testing/mail-notification/mail-notification-5.4-evolution-3-0-support.patch b/testing/mail-notification/mail-notification-5.4-evolution-3-0-support.patch
deleted file mode 100644
index 51a0eb519..000000000
--- a/testing/mail-notification/mail-notification-5.4-evolution-3-0-support.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- jbsrc/lib/src/extras/jb-evolution-plugin.c.evolution30	2011-02-02 00:09:33.945696868 +0100
-+++ jbsrc/lib/src/extras/jb-evolution-plugin.c	2011-02-02 00:28:09.096275028 +0100
-@@ -41,7 +41,7 @@
-   if (! minversion)
-     minversion = "2.12";
- 
--  packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.15 gtkhtml-editor-3.14", minversion);
-+  packages = g_strdup_printf("evolution-plugin-3.0 >= %s libgtkhtml-4.0 gtkhtml-editor-4.0", minversion);
-   result = jb_check_packages("Evolution", "evolution-plugin", packages);
-   g_free(packages);
- 
-@@ -53,7 +53,7 @@
-       char *plugindir;
- 
-       jb_message_checking("for the Evolution plugin directory");
--      plugindir = jb_get_package_variable("evolution-plugin", "plugindir");
-+      plugindir = jb_get_package_variable("evolution-plugin-3.0", "plugindir");
-       jb_message_result_string(plugindir ? plugindir : "not found");
- 
-       if (! plugindir)
---- src/mn-evolution-plugin.c.orig	2011-02-09 00:07:37.422002566 +0100
-+++ src/mn-evolution-plugin.c	2011-02-09 00:12:43.652678682 +0100
-@@ -25,6 +25,7 @@
- #include <dbus/dbus-glib-lowlevel.h>
- #include <dbus/dbus-glib-bindings.h>
- #include <camel/camel.h>
-+#include <libedataserver/eds-version.h>
- #include <mail/em-event.h>
- #include <mail/mail-tools.h>
- #include "mn-evolution.h"
-@@ -249,10 +250,16 @@
- {
-   if (evo_server)
-     {
--      char *url;
-+#if EDS_CHECK_VERSION(2,91,0)
-+      const char *url = camel_folder_get_uri(message->folder);
-+#else
-+      char *url = mail_tools_folder_to_url(message->folder);
-+#endif
- 
--      url = mail_tools_folder_to_url(message->folder);
-       mn_evolution_server_message_reading(evo_server, url);
-+
-+#if !EDS_CHECK_VERSION(2,91,0)
-       g_free(url);
-+#endif
-     }
- }
---- build/src/mn-evolution-server.c.orig	2011-02-09 00:17:38.850944227 +0100
-+++ build/src/mn-evolution-server.c	2011-02-09 22:21:54.155346478 +0100
-@@ -496,11 +496,15 @@
- 
-     if (! folder)
-       {
--	folder = mail_tool_uri_to_folder(uri, 0,
- #if EDS_CHECK_VERSION(2,91,0)
--	      NULL,
-+        static EMailSession * session = NULL;
-+        if (!session)
-+          session = e_mail_session_new();
-+
-+        folder = e_mail_session_uri_to_folder_sync(session, uri, 0, NULL, NULL);
-+#else
-+	folder = mail_tool_uri_to_folder(uri, 0, NULL);
- #endif
--	      NULL);
- 	if (folder)
- 	  self_cache_folder(uri, folder);
- 	else
diff --git a/testing/mail-notification/mail-notification-5.4-evolution-gtkhtml.patch b/testing/mail-notification/mail-notification-5.4-evolution-gtkhtml.patch
deleted file mode 100644
index 283ef36d6..000000000
--- a/testing/mail-notification/mail-notification-5.4-evolution-gtkhtml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nrbu mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c
---- mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c	2008-04-27 18:47:43.000000000 +0400
-+++ mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c	2009-08-21 19:48:22.000000000 +0400
-@@ -41,7 +41,7 @@
-   if (! minversion)
-     minversion = "2.12";
- 
--  packages = g_strdup_printf("evolution-plugin >= %s", minversion);
-+  packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.15 gtkhtml-editor-3.14", minversion);
-   result = jb_check_packages("Evolution", "evolution-plugin", packages);
-   g_free(packages);
- 
diff --git a/testing/mail-notification/mail-notification-5.4-evolution.patch b/testing/mail-notification/mail-notification-5.4-evolution.patch
deleted file mode 100644
index 87514c22d..000000000
--- a/testing/mail-notification/mail-notification-5.4-evolution.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c mail-notification-5.4-OK/build/src/mn-evolution-folder-tree-server.c
---- mail-notification-5.4/build/src/mn-evolution-folder-tree-server.c	2008-05-22 19:47:48.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-evolution-folder-tree-server.c	2010-10-12 16:50:15.000000000 +0400
-@@ -25,7 +25,10 @@
- #line 24 "src/mn-evolution-folder-tree-server.gob"
- 
- #include <dbus/dbus.h>
-+#include <libedataserver/eds-version.h>
-+#if !EDS_CHECK_VERSION(2,29,0)
- #include <mail/mail-component.h>
-+#endif
- #include <mail/em-folder-tree.h>
- #include "mn-evolution-plugin.h"
- #include "mn-evolution.h"
-@@ -441,10 +444,17 @@
- {
- #line 61 "src/mn-evolution-folder-tree-server.gob"
- 	
-+#if EDS_CHECK_VERSION(2,91,0)
-+    selfp->session = e_mail_session_new();
-+    selfp->tree = em_folder_tree_new(selfp->session);
-+#elif EDS_CHECK_VERSION(2,29,0)
-+    selfp->tree = em_folder_tree_new();
-+#else
-     EMFolderTreeModel *model;
- 
-     model = mail_component_peek_tree_model(mail_component_peek());
-     selfp->tree = em_folder_tree_new_with_model(model);
-+#endif
- 
-     selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id);
-     gtk_container_add(GTK_CONTAINER(selfp->plug), selfp->tree);
-@@ -469,6 +479,10 @@
- {
- #line 80 "src/mn-evolution-folder-tree-server.gob"
- 	
-+#if EDS_CHECK_VERSION(2,91,0)
-+    g_object_unref(selfp->session);
-+    selfp->session = NULL;
-+#endif
-     g_signal_handlers_disconnect_by_func(selfp->plug, self_plug_destroy_h, self);
-   }}
- #line 475 "mn-evolution-folder-tree-server.c"
-diff -Nrbu mail-notification-5.4/build/src/mn-evolution-server.c mail-notification-5.4-OK/build/src/mn-evolution-server.c
---- mail-notification-5.4/build/src/mn-evolution-server.c	2008-05-22 19:47:48.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-evolution-server.c	2010-10-12 16:50:40.000000000 +0400
-@@ -27,12 +27,22 @@
- #include <stdio.h>
- #include <libintl.h>
- #include <gobject/gvaluecollector.h>
-+#include <libedataserver/eds-version.h>
- #include <camel/camel-folder.h>
-+#if EDS_CHECK_VERSION(2,29,0)
-+#include <shell/e-shell.h>
-+#include <mail/e-mail-browser.h>
-+#else
- #include <mail/em-folder-view.h>
- #include <mail/em-format.h>
- #include <mail/em-message-browser.h>
-+#endif
- #include <mail/em-utils.h>
-+#if EDS_CHECK_VERSION(2,91,0)
-+#include <mail/e-mail-session.h>
-+#else
- #include <mail/mail-session.h>
-+#endif
- #include <mail/mail-tools.h>
- #include "mn-evolution.h"
- #include "mn-evolution-folder-tree-server.h"
-@@ -391,10 +397,18 @@
-     info = g_new0(FolderInfo, 1);
-     info->uri = g_strdup(uri);
-     info->folder = folder;
-+#if EDS_CHECK_VERSION(2,31,0)
-+    g_object_ref(folder);
-+#else
-     camel_object_ref(folder);
-+#endif
- 
-     /* uncache the folder when it is deleted */
-+#if EDS_CHECK_VERSION(2,31,0)
-+    g_signal_connect(folder, "deleted", G_CALLBACK(self_folder_deleted_cb), info);
-+#else
-     camel_object_hook_event(folder, "deleted", self_folder_deleted_cb, info);
-+#endif
- 
-     g_hash_table_replace(folders, info->uri, info);
-   }}
-@@ -413,8 +427,13 @@
- {
- #line 105 "src/mn-evolution-server.gob"
- 	
-+#if EDS_CHECK_VERSION(2,31,0)
-+    g_signal_handlers_disconnect_by_func(info->folder, self_folder_deleted_cb, info);
-+    g_object_unref(info->folder);
-+#else
-     camel_object_unhook_event(info->folder, "deleted", self_folder_deleted_cb, info);
-     camel_object_unref(info->folder);
-+#endif
-     g_free(info->uri);
-     g_free(info);
-   }}
-@@ -461,7 +480,11 @@
- 	if (info)
- 	  {
- 	    folder = info->folder;
-+#if EDS_CHECK_VERSION(2,31,0)
-+	    g_object_ref(folder);
-+#else
- 	    camel_object_ref(folder);
-+#endif
- 	  }
-       }
-     else
-@@ -469,7 +492,11 @@
- 
-     if (! folder)
-       {
--	folder = mail_tool_uri_to_folder(uri, 0, NULL);
-+	folder = mail_tool_uri_to_folder(uri, 0,
-+#if EDS_CHECK_VERSION(2,91,0)
-+	      NULL,
-+#endif
-+	      NULL);
- 	if (folder)
- 	  self_cache_folder(uri, folder);
- 	else
-@@ -595,14 +622,23 @@
- 
- 	for (i = 0; i < summary->len; i++)
- 	  {
-+#if EDS_CHECK_VERSION(2,23,5)
-+	    char *uid = summary->pdata[i];
-+	    CamelMessageInfo *info = camel_folder_get_message_info(folder, uid);
-+#else
- 	    CamelMessageInfo *info = summary->pdata[i];
-+#endif
- 
- 	    if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0)
- 	      g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info));
- 	  }
- 
- 	camel_folder_free_summary(folder, summary);
-+#if EDS_CHECK_VERSION(2,31,0)
-+	g_object_unref(folder);
-+#else
- 	camel_object_unref(folder);
-+#endif
-       }
- 
-     GDK_THREADS_LEAVE();
-@@ -638,7 +674,11 @@
-     if (folder)
-       {
- 	*ret = g_strdup(camel_folder_get_name(folder));
-+#if EDS_CHECK_VERSION(2,31,0)
-+	g_object_unref(folder);
-+#else
- 	camel_object_unref(folder);
-+#endif
-       }
- 
-     GDK_THREADS_LEAVE();
-@@ -673,6 +713,19 @@
-     folder = self_lookup_folder(folder_uri, err);
-     if (folder)
-       {
-+#if EDS_CHECK_VERSION(2,29,0)
-+	EShell *shell;
-+	EShellBackend *shell_backend;
-+	GtkWidget *browser;
-+
-+	shell = e_shell_get_default ();
-+	shell_backend = e_shell_get_backend_by_name (shell, "mail");
-+
-+	browser = e_mail_browser_new (shell_backend);
-+	e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri);
-+	e_mail_reader_set_message (E_MAIL_READER (browser), message_uid);
-+	gtk_widget_show (browser);
-+#else
- 	GtkWidget *browser;
- 
- 	/* modelled after Evolution's handleuri_got_folder() */
-@@ -683,8 +736,13 @@
- 	em_folder_view_set_folder((EMFolderView *) browser, folder, folder_uri);
- 	em_folder_view_set_message((EMFolderView *) browser, message_uid, FALSE);
- 	gtk_widget_show(((EMMessageBrowser *) browser)->window);
-+#endif
- 
-+#if EDS_CHECK_VERSION(2,31,0)
-+	g_object_unref(folder);
-+#else
- 	camel_object_unref(folder);
-+#endif
-       }
- 
-     GDK_THREADS_LEAVE();
-@@ -721,7 +779,11 @@
-     if (folder)
-       {
- 	status = camel_folder_set_message_flags(folder, message_uid, flags, flags);
-+#if EDS_CHECK_VERSION(2,31,0)
-+	g_object_unref(folder);
-+#else
- 	camel_object_unref(folder);
-+#endif
- 
- 	if (! status)
- 	  g_set_error(err,
-diff -Nrbu mail-notification-5.4/src/mn-evolution-plugin.c mail-notification-5.4-OK/src/mn-evolution-plugin.c
---- mail-notification-5.4/src/mn-evolution-plugin.c	2008-05-22 19:45:35.000000000 +0400
-+++ mail-notification-5.4-OK/src/mn-evolution-plugin.c	2010-10-12 16:50:15.000000000 +0400
-@@ -204,7 +204,7 @@
- }
- 
- int
--e_plugin_lib_enable (EPluginLib *ep, int enable)
-+e_plugin_lib_enable (EPlugin *ep, int enable)
- {
-   static gboolean enabled = FALSE;
-   GError *err = NULL;
---- mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h.orig	2010-11-13 13:55:01.571934066 +0100
-+++ mail-notification-5.4/build/src/mn-evolution-folder-tree-server-private.h	2010-11-13 13:56:07.019487418 +0100
-@@ -4,6 +4,10 @@
- #define __MN_EVOLUTION_FOLDER_TREE_SERVER_PRIVATE_H__
- 
- #include "mn-evolution-folder-tree-server.h"
-+#include <libedataserver/eds-version.h>
-+#if EDS_CHECK_VERSION(2,91,0)
-+#include <mail/e-mail-session.h>
-+#endif
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -23,6 +23,9 @@
- #line 41 "src/mn-evolution-folder-tree-server.gob"
- 	GtkWidget * tree;
- #line 26 "mn-evolution-folder-tree-server-private.h"
-+#if EDS_CHECK_VERSION(2,91,0)
-+       EMailSession * session;
-+#endif
- };
- 
- #ifdef __cplusplus
diff --git a/testing/mail-notification/mail-notification-5.4-gtk3-support.patch b/testing/mail-notification/mail-notification-5.4-gtk3-support.patch
deleted file mode 100644
index cd19c2e84..000000000
--- a/testing/mail-notification/mail-notification-5.4-gtk3-support.patch
+++ /dev/null
@@ -1,1382 +0,0 @@
---- build/src/mn-dialog.c.orig	2011-02-02 23:08:09.816659245 +0100
-+++ build/src/mn-dialog.c	2011-02-02 23:09:16.988113774 +0100
-@@ -106,8 +106,7 @@
- #line 27 "src/mn-dialog.gob"
- 
-     gtk_container_set_border_width(GTK_CONTAINER(self), 5);
--    gtk_dialog_set_has_separator(GTK_DIALOG(self), FALSE);
--    gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(self)->vbox), 2);
-+    gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(self))), 2);
-   
- #line 113 "mn-dialog.c"
-  }
---- jbsrc/jb.c.orig	2011-02-02 23:40:33.567924712 +0100
-+++ jbsrc/jb.c	2011-02-02 23:39:39.680803618 +0100
-@@ -163,7 +163,7 @@
- {
-   jb_check_glibc();
- 
--  jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-2.0 >= 2.12 libgnomeui-2.0 >= 2.14.0 gnome-vfs-2.0 libglade-2.0 libxml-2.0 libnotify >= 0.4.1");
-+  jb_require_packages("GNOME", "gnome", "glib-2.0 >= 2.14 gthread-2.0 gconf-2.0 >= 2.4.0 gtk+-3.0 libgnome-2.0 >= 2.14.0 gnome-vfs-2.0 libxml-2.0 libnotify >= 0.4.1");
-   jb_require_packages("D-Bus", "dbus", "dbus-glib-1");
- 
-   jb_check_packages_for_options("GMime", "gmime", "gmime-2.4",
---- build/src/mn-file-chooser-button.c.orig	2011-02-02 23:38:01.503049512 +0100
-+++ build/src/mn-file-chooser-button.c	2011-02-02 23:38:16.988222034 +0100
-@@ -358,7 +358,7 @@
- 	g_signal_connect(selfp->dialog, "response", G_CALLBACK(self_response_h), self);
-       }
- 
--    if (! GTK_WIDGET_VISIBLE(selfp->dialog))
-+    if (! gtk_widget_get_visible(selfp->dialog))
-       {
- 	GtkWindow *parent;
- 
---- build/src/mn-sound-player.c.orig	2011-02-02 23:55:02.436500397 +0100
-+++ build/src/mn-sound-player.c	2011-02-02 23:55:09.125141055 +0100
-@@ -27,7 +27,7 @@
- #include <sys/types.h>
- #include <signal.h>
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include "mn-conf.h"
- #include "mn-locked-callback.h"
- #include "mn-util.h"
---- build/src/mn-file-chooser-button.c.orig	2011-02-02 23:55:21.857457045 +0100
-+++ build/src/mn-file-chooser-button.c	2011-02-02 23:55:30.422996901 +0100
-@@ -25,7 +25,7 @@
- #line 39 "src/mn-file-chooser-button.gob"
- 
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include "mn-util.h"
- 
- #line 32 "mn-file-chooser-button.c"
---- build/src/mn-message.c.orig	2011-02-02 23:55:41.160420099 +0100
-+++ build/src/mn-message.c	2011-02-02 23:55:47.755065850 +0100
-@@ -26,7 +26,7 @@
- 
- #include <errno.h>
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include <libgnomevfs/gnome-vfs.h>
- #include "mn-conf.h"
- #include "mn-util.h"
---- build/src/mn-file-chooser-button.c.orig	2011-02-03 00:15:16.178407712 +0100
-+++ build/src/mn-file-chooser-button.c	2011-02-03 00:18:17.865681563 +0100
-@@ -463,6 +463,7 @@
- 
-     GDK_THREADS_ENTER();
- 
-+#if 0
-     if (results)
-       {
- 	GnomeVFSGetFileInfoResult *result = results->data;
-@@ -494,6 +495,7 @@
- 	      }
- 	  }
-       }
-+#endif
- 
-     selfp->async_handle = NULL;
-     g_object_unref(self);
---- build/src/mn-evolution-folder-tree-server.c.orig	2011-02-07 20:17:09.574274620 +0100
-+++ build/src/mn-evolution-folder-tree-server.c	2011-02-07 20:23:25.196053994 +0100
-@@ -25,6 +25,7 @@
- #line 24 "src/mn-evolution-folder-tree-server.gob"
- 
- #include <dbus/dbus.h>
-+#include <gtk/gtkx.h>
- #include <libedataserver/eds-version.h>
- #if !EDS_CHECK_VERSION(2,29,0)
- #include <mail/mail-component.h>
-@@ -71,7 +72,7 @@
- static void mn_evolution_folder_tree_server_finalize (MNEvolutionFolderTreeServer * self);
- #line 70 "mn-evolution-folder-tree-server.c"
- #line 84 "src/mn-evolution-folder-tree-server.gob"
--static void mn_evolution_folder_tree_server_plug_destroy_h (GtkObject * object, gpointer user_data);
-+static void mn_evolution_folder_tree_server_plug_destroy_h (GtkWidget * object, gpointer user_data);
- #line 73 "mn-evolution-folder-tree-server.c"
- #line 104 "src/mn-evolution-folder-tree-server.gob"
- static void mn_evolution_folder_tree_server_selected_h (EMFolderTree * tree, const char * full_name, const char * uri, guint32 flags, gpointer user_data);
-@@ -456,7 +457,7 @@
-     selfp->tree = em_folder_tree_new_with_model(model);
- #endif
- 
--    selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id);
-+    selfp->plug = gtk_plug_new((Window) selfp->id);
-     gtk_container_add(GTK_CONTAINER(selfp->plug), selfp->tree);
-     gtk_widget_show_all(selfp->plug);
- 
-@@ -490,7 +491,7 @@
- 
- #line 84 "src/mn-evolution-folder-tree-server.gob"
- static void 
--mn_evolution_folder_tree_server_plug_destroy_h (GtkObject * object, gpointer user_data)
-+mn_evolution_folder_tree_server_plug_destroy_h (GtkWidget * object, gpointer user_data)
- {
- #line 482 "mn-evolution-folder-tree-server.c"
- #define __GOB_FUNCTION__ "MN:Evolution:Folder:Tree:Server::plug_destroy_h"
---- src/eggtrayicon.h.orig	2011-02-07 20:25:26.352057350 +0100
-+++ src/eggtrayicon.h	2011-02-07 20:27:54.495032920 +0100
-@@ -23,10 +23,9 @@
- #ifndef __EGG_TRAY_ICON_H__
- #define __EGG_TRAY_ICON_H__
- 
--#include <gtk/gtkplug.h>
--#ifdef GDK_WINDOWING_X11
-+#include <gtk/gtk.h>
-+#include <gtk/gtkx.h>
- #include <gdk/gdkx.h>
--#endif
- 
- G_BEGIN_DECLS
- 
---- build/src/mn-mail-icon.c.orig	2011-02-07 20:24:58.971663075 +0100
-+++ build/src/mn-mail-icon.c	2011-02-07 20:30:33.714401306 +0100
-@@ -833,11 +833,13 @@
- #line 239 "src/mn-mail-icon.gob"
- 	
-     GtkWidget *widget = user_data;
-+    GtkAllocation allocation;
- 
--    gdk_window_get_origin(widget->window, x, y);
-+    gdk_window_get_origin(gtk_widget_get_window(widget), x, y);
-+    gtk_widget_get_allocation(widget, &allocation);
- 
--    *x += widget->allocation.x;
--    *y += widget->allocation.y;
-+    *x += allocation.x;
-+    *y += allocation.y;
- 
-     if (*y > gdk_screen_get_height(gtk_widget_get_screen(widget)) / 2)
-       {
-@@ -847,7 +849,7 @@
- 	*y -= req.height;
-       }
-     else
--      *y += widget->allocation.height;
-+      *y += allocation.height;
- 
-     *push_in = TRUE;
-   }}
---- build/src/mn-mail-icon-widget.c.orig	2011-02-07 20:31:19.475816763 +0100
-+++ build/src/mn-mail-icon-widget.c	2011-02-07 21:53:48.858814715 +0100
-@@ -64,9 +64,13 @@
- #line 65 "mn-mail-icon-widget.c"
- #line 110 "src/mn-mail-icon-widget.gob"
- static void ___7_mn_mail_icon_widget_size_request (GtkWidget * widget, GtkRequisition * requisition);
-+static void
-+mn_mail_icon_widget_get_preferred_width(GtkWidget *widget, gint  *minimal_width, gint *natural_width);
-+static void
-+mn_mail_icon_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height);
- #line 68 "mn-mail-icon-widget.c"
- #line 132 "src/mn-mail-icon-widget.gob"
--static gboolean ___8_mn_mail_icon_widget_expose_event (GtkWidget * widget, GdkEventExpose * event);
-+static gboolean ___8_mn_mail_icon_widget_draw (GtkWidget * widget, cairo_t *cr);
- #line 71 "mn-mail-icon-widget.c"
- #line 244 "src/mn-mail-icon-widget.gob"
- static GdkPixbuf * mn_mail_icon_widget_render_icon (MNMailIconWidget * self);
-@@ -187,9 +191,10 @@
- 	parent_class = g_type_class_ref (GTK_TYPE_WIDGET);
- 
- #line 110 "src/mn-mail-icon-widget.gob"
--	gtk_widget_class->size_request = ___7_mn_mail_icon_widget_size_request;
-+	gtk_widget_class->get_preferred_width = mn_mail_icon_widget_get_preferred_width;
-+	gtk_widget_class->get_preferred_height = mn_mail_icon_widget_get_preferred_height;
- #line 132 "src/mn-mail-icon-widget.gob"
--	gtk_widget_class->expose_event = ___8_mn_mail_icon_widget_expose_event;
-+	gtk_widget_class->draw = ___8_mn_mail_icon_widget_draw;
- #line 194 "mn-mail-icon-widget.c"
- 	g_object_class->dispose = ___dispose;
- 	g_object_class->finalize = ___finalize;
-@@ -234,7 +239,7 @@
-  {
- #line 93 "src/mn-mail-icon-widget.gob"
- 
--    GTK_WIDGET_SET_FLAGS(self, GTK_NO_WINDOW);
-+    gtk_widget_set_has_window(GTK_WIDGET(self), FALSE);
- 
-     gtk_widget_set_name(GTK_WIDGET(self), "mn-mail-icon");
- 
-@@ -457,9 +462,28 @@
- #undef __GOB_FUNCTION__
- #undef PARENT_HANDLER
- 
-+static void
-+mn_mail_icon_widget_get_preferred_width(GtkWidget *widget, gint  *minimal_width, gint *natural_width)
-+{
-+    GtkRequisition requisition;
-+
-+    ___7_mn_mail_icon_widget_size_request (widget, &requisition);
-+    *minimal_width = *natural_width = requisition.width;
-+}
-+
-+static void
-+mn_mail_icon_widget_get_preferred_height(GtkWidget *widget, gint *minimal_height, gint *natural_height)
-+{
-+    GtkRequisition requisition;
-+
-+    ___7_mn_mail_icon_widget_size_request (widget, &requisition);
-+
-+    *minimal_height = *natural_height = requisition.height;
-+}
-+
- #line 132 "src/mn-mail-icon-widget.gob"
- static gboolean 
--___8_mn_mail_icon_widget_expose_event (GtkWidget * widget G_GNUC_UNUSED, GdkEventExpose * event)
-+___8_mn_mail_icon_widget_draw (GtkWidget * widget G_GNUC_UNUSED, cairo_t *cr)
- #line 464 "mn-mail-icon-widget.c"
- #define PARENT_HANDLER(___widget,___event) \
- 	((GTK_WIDGET_CLASS(parent_class)->expose_event)? \
-@@ -472,7 +496,7 @@
- 	
-     Self *self = SELF(widget);
- 
--    if (! GTK_WIDGET_DRAWABLE(widget) || ! selfp->stock_id)
-+    if (! gtk_widget_is_drawable(widget) || ! selfp->stock_id)
-       return FALSE;
- 
-     if (selfp->is_on)
-@@ -480,23 +504,34 @@
- 	int x;
- 	int y;
- 	GdkRectangle image_area;
-+        GtkAllocation allocation;
-+        GtkRequisition requisition;
- 
- 	/* note: widget->requisition is the pixbuf size, see size_request() */
- 
--	x = floor(widget->allocation.x + ((widget->allocation.width - widget->requisition.width) * ICON_XALIGN));
--	y = floor(widget->allocation.y + ((widget->allocation.height - widget->requisition.height) * ICON_YALIGN));
-+        gtk_widget_get_allocation(widget, &allocation);
-+        gtk_widget_get_requisition(widget, &requisition);
-+
-+	x = floor(allocation.x + ((allocation.width - requisition.width) * ICON_XALIGN));
-+	y = floor(allocation.y + ((allocation.height - requisition.height) * ICON_YALIGN));
- 
- 	image_area.x = x;
- 	image_area.y = y;
--	image_area.width = widget->requisition.width;
--	image_area.height = widget->requisition.height;
-+	image_area.width = requisition.width;
-+	image_area.height = requisition.height;
- 
-+#if 0
- 	if (gdk_rectangle_intersect(&event->area, &image_area, &image_area))
-+#endif
- 	  {
- 	    GdkPixbuf *pixbuf;
- 
- 	    pixbuf = self_render_icon(self);
-+            gdk_cairo_set_source_pixbuf(cr, pixbuf, image_area.x, image_area.y);
-+            cairo_move_to(cr, image_area.x - x, image_area.y - y);
-+            cairo_paint(cr);
- 
-+#if 0
- 	    gdk_draw_pixbuf(widget->window,
- 			    NULL,
- 			    pixbuf,
-@@ -509,6 +544,7 @@
- 			    GDK_RGB_DITHER_NORMAL,
- 			    0,
- 			    0);
-+#endif
- 
- 	    g_object_unref(pixbuf);
- 	  }
-@@ -523,13 +559,16 @@
- 	int box_y;
- 	int box_width;
- 	int box_height;
-+        GtkAllocation allocation;
-+
-+        gtk_widget_get_allocation(widget, &allocation);
- 
- 	if (! selfp->count_layout)
- 	  {
- 	    const char *size;
- 	    char *markup;
- 
--	    if (widget->allocation.height < 32)
-+	    if (allocation.height < 32)
- 	      size = "small";
- 	    else
- 	      size = "medium";
-@@ -546,17 +585,16 @@
- 	box_width = count_rect.width + COUNT_BOX_XPAD * 2;
- 	box_height = count_rect.height + COUNT_BOX_YPAD * 2;
- 
--	box_x = widget->allocation.x + widget->allocation.width - box_width - COUNT_BOX_XMARGIN;
--	box_y = widget->allocation.y + widget->allocation.height - box_height - COUNT_BOX_YMARGIN;
-+	box_x = allocation.x + allocation.width - box_width - COUNT_BOX_XMARGIN;
-+	box_y = allocation.y + allocation.height - box_height - COUNT_BOX_YMARGIN;
- 
- 	count_x = box_x - count_rect.x + COUNT_BOX_XPAD;
- 	count_y = box_y - count_rect.y + COUNT_BOX_YPAD;
- 
--	gtk_paint_box(widget->style,
--		      widget->window,
--		      GTK_WIDGET_STATE(widget),
-+	gtk_paint_box(gtk_widget_get_style(widget),
-+		      cr,
-+		      gtk_widget_get_state_flags(widget),
- 		      GTK_SHADOW_OUT,
--		      &event->area,
- 		      widget,
- 		      NULL,
- 		      box_x,
-@@ -564,11 +602,10 @@
- 		      box_width,
- 		      box_height);
- 
--	gtk_paint_layout(widget->style,
--			 widget->window,
--			 GTK_WIDGET_STATE(widget),
-+	gtk_paint_layout(gtk_widget_get_style(widget),
-+			 cr,
-+			 gtk_widget_get_state_flags(widget),
- 			 FALSE,
--			 &event->area,
- 			 widget,
- 			 NULL,
- 			 count_x,
---- build/src/mn-mailbox-properties-dialog.c.orig	2011-02-07 21:57:31.257251776 +0100
-+++ build/src/mn-mailbox-properties-dialog.c	2011-02-07 21:56:56.989854854 +0100
-@@ -456,7 +456,7 @@
-     MNMailboxProperties *properties;
- 
-     mn_container_create_interface(GTK_CONTAINER(self),
--				  PKGDATADIR G_DIR_SEPARATOR_S "mailbox-properties-dialog.glade",
-+				  PKGDATADIR G_DIR_SEPARATOR_S "mailbox-properties-dialog.ui",
- 				  "notebook",
- 				  "mn_mailbox_properties_dialog_",
- 				  "notebook", &self->notebook,
-@@ -1290,7 +1290,7 @@
- {
- #line 686 "src/mn-mailbox-properties-dialog.gob"
- 	
--    if (GTK_WIDGET_IS_SENSITIVE(GTK_WINDOW(self)->default_widget))
-+    if (gtk_widget_is_sensitive(gtk_window_get_default_widget(GTK_WINDOW(self))))
-       gtk_window_activate_default(GTK_WINDOW(self));
-     else
-       {
-@@ -1313,9 +1313,9 @@
- 	    if (elem->data == entry)
- 	      break;
- 
--	    if (GTK_WIDGET_MAPPED(elem->data)
--		&& GTK_WIDGET_VISIBLE(elem->data)
--		&& GTK_WIDGET_SENSITIVE(elem->data))
-+	    if (gtk_widget_get_mapped(elem->data)
-+		&& gtk_widget_get_visible(elem->data)
-+		&& gtk_widget_get_sensitive(elem->data))
- 	      next = elem->data;
- 	  }
- 	while (! next);
---- build/src/mn-mailbox-view.c.orig	2011-02-07 22:18:49.962462920 +0100
-+++ build/src/mn-mailbox-view.c	2011-02-07 23:01:39.990363248 +0100
-@@ -412,23 +412,23 @@
-     binding_set = gtk_binding_set_by_class(class);
- 
-     /* Delete removes a row */
--    gtk_binding_entry_add_signal(binding_set, GDK_Delete, 0, "activate-remove", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_KP_Delete, 0, "activate-remove", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_Delete, 0, "activate-remove", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_KP_Delete, 0, "activate-remove", 0);
- 
-     /* HIG 2.0 cut/copy/paste shortcuts */
--    gtk_binding_entry_add_signal(binding_set, GDK_x, GDK_CONTROL_MASK, "activate-cut", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_c, GDK_CONTROL_MASK, "activate-copy", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_v, GDK_CONTROL_MASK, "activate-paste", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_x, GDK_CONTROL_MASK, "activate-cut", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_c, GDK_CONTROL_MASK, "activate-copy", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_v, GDK_CONTROL_MASK, "activate-paste", 0);
- 
-     /* cut/copy/paste shortcuts taken from gtkentry.c */
--    gtk_binding_entry_add_signal(binding_set, GDK_Delete, GDK_SHIFT_MASK, "activate-cut", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_Insert, GDK_CONTROL_MASK, "activate-copy", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_Insert, GDK_SHIFT_MASK, "activate-paste", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_Delete, GDK_SHIFT_MASK, "activate-cut", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_Insert, GDK_CONTROL_MASK, "activate-copy", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_Insert, GDK_SHIFT_MASK, "activate-paste", 0);
- 
-     /* HIG 2.0 properties */
--    gtk_binding_entry_add_signal(binding_set, GDK_Return, GDK_MOD1_MASK, "activate-properties", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_ISO_Enter, GDK_MOD1_MASK, "activate-properties", 0);
--    gtk_binding_entry_add_signal(binding_set, GDK_KP_Enter, GDK_MOD1_MASK, "activate-properties", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_Return, GDK_MOD1_MASK, "activate-properties", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_ISO_Enter, GDK_MOD1_MASK, "activate-properties", 0);
-+    gtk_binding_entry_add_signal(binding_set, GDK_KEY_KP_Enter, GDK_MOD1_MASK, "activate-properties", 0);
-   
- #line 434 "mn-mailbox-view.c"
-  }
-@@ -934,14 +934,13 @@
- #line 183 "src/mn-mailbox-view.gob"
- 	
-     GtkSelectionData *data;
--
-     data = gtk_clipboard_wait_for_contents(global_clipboard, clipboard_info[TARGET_MAILBOXES].atom);
-     if (data)
-       {
- 	GSList *configurations;
- 	GSList *l;
- 
--	memcpy(&configurations, data->data, data->length);
-+	memcpy(&configurations, gtk_selection_data_get_data(data), gtk_selection_data_get_length(data));
- 
- 	MN_LIST_FOREACH(l, configurations)
- 	  {
-@@ -962,14 +961,14 @@
-     data = gtk_clipboard_wait_for_contents(global_clipboard, clipboard_info[TARGET_GNOME_COPIED_FILES].atom);
-     if (data)
-       {
--	if (data->format == 8 && data->length > 0)
-+	if (gtk_selection_data_get_format(data) == 8 && gtk_selection_data_get_length(data) > 0)
- 	  {
- 	    char *gnome_copied_files;
- 	    gboolean status;
- 	    MNGnomeCopiedFilesType type;
- 	    GSList *uri_list;
- 
--	    gnome_copied_files = g_strndup(data->data, data->length);
-+	    gnome_copied_files = g_strndup(gtk_selection_data_get_data(data), gtk_selection_data_get_length(data));
- 	    status = mn_parse_gnome_copied_files(gnome_copied_files, &type, &uri_list);
- 	    g_free(gnome_copied_files);
- 
---- build/src/mn-shell.c.orig	2011-02-07 23:02:17.852293679 +0100
-+++ build/src/mn-shell.c	2011-02-07 23:04:39.223548403 +0100
-@@ -158,7 +158,7 @@
- static void mn_shell_icon_activate_about_h (MNMailIcon * icon, gpointer user_data);
- #line 160 "mn-shell.c"
- #line 499 "src/mn-shell.gob"
--static void mn_shell_icon_destroy_h (GtkObject * object, gpointer user_data);
-+static void mn_shell_icon_destroy_h (GtkWidget * object, gpointer user_data);
- #line 163 "mn-shell.c"
- #line 508 "src/mn-shell.gob"
- static void mn_shell_update_sensitivity (MNShell * self);
-@@ -1006,7 +1006,7 @@
- 
- #line 499 "src/mn-shell.gob"
- static void 
--mn_shell_icon_destroy_h (GtkObject * object, gpointer user_data)
-+mn_shell_icon_destroy_h (GtkWidget * object, gpointer user_data)
- {
- #line 1004 "mn-shell.c"
- #define __GOB_FUNCTION__ "MN:Shell::icon_destroy_h"
---- build/src/mn-text-table.c.orig	2011-02-07 23:05:08.799927792 +0100
-+++ build/src/mn-text-table.c	2011-02-07 23:18:06.480056895 +0100
-@@ -69,9 +69,11 @@
- #line 70 "mn-text-table.c"
- #line 104 "src/mn-text-table.gob"
- static void ___4_mn_text_table_size_request (GtkWidget * widget, GtkRequisition * requisition);
-+static void mn_text_table_get_preferred_width (GtkWidget * widget, gint * minimal_width, gint * natural_width);
-+static void mn_text_table_get_preferred_height (GtkWidget * widget, gint * minimal_height, gint * natural_height);
- #line 73 "mn-text-table.c"
- #line 115 "src/mn-text-table.gob"
--static gboolean ___5_mn_text_table_expose_event (GtkWidget * widget, GdkEventExpose * event);
-+static gboolean ___5_mn_text_table_draw (GtkWidget * widget, cairo_t *cr);
- #line 76 "mn-text-table.c"
- #line 165 "src/mn-text-table.gob"
- static void mn_text_table_set_dirty (MNTextTable * self);
-@@ -188,9 +190,10 @@
- 	parent_class = g_type_class_ref (GTK_TYPE_WIDGET);
- 
- #line 104 "src/mn-text-table.gob"
--	gtk_widget_class->size_request = ___4_mn_text_table_size_request;
-+        gtk_widget_class->get_preferred_width = mn_text_table_get_preferred_width;
-+        gtk_widget_class->get_preferred_height = mn_text_table_get_preferred_height;
- #line 115 "src/mn-text-table.gob"
--	gtk_widget_class->expose_event = ___5_mn_text_table_expose_event;
-+	gtk_widget_class->draw = ___5_mn_text_table_draw;
- #line 257 "src/mn-text-table.gob"
- 	c->clear = ___real_mn_text_table_clear;
- #line 197 "mn-text-table.c"
-@@ -216,7 +219,7 @@
-  {
- #line 80 "src/mn-text-table.gob"
- 
--    GTK_WIDGET_SET_FLAGS(self, GTK_NO_WINDOW);
-+    gtk_widget_set_has_window(GTK_WIDGET(self), FALSE);
- 
-     g_object_connect(self,
- 		     "swapped-signal::style-set", self_context_changed, self,
-@@ -290,9 +293,29 @@
- #undef __GOB_FUNCTION__
- #undef PARENT_HANDLER
- 
-+static void
-+mn_text_table_get_preferred_width (GtkWidget * widget, gint * minimal_width, gint * natural_width)
-+{
-+    GtkRequisition requisition;
-+
-+    ___4_mn_text_table_size_request (widget, &requisition);
-+
-+    *minimal_width = *natural_width = requisition.width;
-+}
-+
-+static void
-+mn_text_table_get_preferred_height (GtkWidget * widget, gint * minimal_height, gint * natural_height)
-+{
-+    GtkRequisition requisition;
-+
-+    ___4_mn_text_table_size_request (widget, &requisition);
-+
-+    *minimal_height = *natural_height = requisition.height;
-+}
-+
- #line 115 "src/mn-text-table.gob"
- static gboolean 
--___5_mn_text_table_expose_event (GtkWidget * widget G_GNUC_UNUSED, GdkEventExpose * event)
-+___5_mn_text_table_draw (GtkWidget * widget G_GNUC_UNUSED, cairo_t *cr)
- #line 297 "mn-text-table.c"
- #define PARENT_HANDLER(___widget,___event) \
- 	((GTK_WIDGET_CLASS(parent_class)->expose_event)? \
-@@ -304,10 +327,14 @@
- #line 117 "src/mn-text-table.gob"
- 	
-     Self *self = SELF(widget);
-+    GtkAllocation allocation;
-     int i;
--    int y = widget->allocation.y;
-+    int y;
-+
-+    gtk_widget_get_allocation(widget, &allocation);
-+    y = allocation.y;
- 
--    if (! GTK_WIDGET_DRAWABLE(widget))
-+    if (! gtk_widget_is_drawable(widget))
-       return FALSE;
- 
-     self_relayout(self);
-@@ -316,7 +343,7 @@
-       {
- 	Row *row = g_ptr_array_index(selfp->rows, i);
- 	int j;
--	int x = widget->allocation.x;
-+	int x = allocation.x;
- 	int column = 0;
- 
- 	MN_ARRAY_FOREACH(j, row->cells)
-@@ -324,11 +351,10 @@
- 	    MNTextTableCell *cell = g_ptr_array_index(row->cells, j);
- 
- 	    if (cell->layout)
--	      gtk_paint_layout(widget->style,
--			       widget->window,
--			       GTK_WIDGET_STATE(widget),
-+	      gtk_paint_layout(gtk_widget_get_style(widget),
-+			       cr,
-+			       gtk_widget_get_state_flags(widget),
- 			       FALSE,
--			       &event->area,
- 			       widget,
- 			       NULL,
- 			       x,
---- build/src/mn-tooltips.c.orig	2011-02-07 23:19:05.903761972 +0100
-+++ build/src/mn-tooltips.c	2011-02-07 23:41:19.368621912 +0100
-@@ -104,7 +104,7 @@
- static void mn_tooltips_set_tip_widget_real (MNTooltips * self, GtkWidget * widget, GtkWidget * tip_widget, int border_width);
- #line 106 "mn-tooltips.c"
- #line 287 "src/mn-tooltips.gob"
--static gboolean mn_tooltips_paint_window (MNTooltips * self);
-+static gboolean mn_tooltips_paint_window (MNTooltips * self, cairo_t *cr);
- #line 109 "mn-tooltips.c"
- #line 308 "src/mn-tooltips.gob"
- static void mn_tooltips_draw_tips (MNTooltips * self);
-@@ -430,7 +430,7 @@
- 	gtk_container_set_border_width(GTK_CONTAINER(selfp->window), selfp->border_width);
- 
- 	g_signal_connect_swapped(selfp->window,
--				 "expose-event",
-+				 "draw",
- 				 G_CALLBACK(self_paint_window),
- 				 self);
- 
-@@ -490,7 +490,7 @@
- 
-     if (selfp->active_data
- 	&& selfp->active_data->widget == widget
--	&& GTK_WIDGET_DRAWABLE(selfp->active_data->widget))
-+	&& gtk_widget_is_drawable(selfp->active_data->widget))
-       {
- 	if (data->tip_widget)
- 	  g_object_unref(data->tip_widget);
-@@ -594,7 +594,7 @@
- 
- #line 287 "src/mn-tooltips.gob"
- static gboolean 
--mn_tooltips_paint_window (MNTooltips * self)
-+mn_tooltips_paint_window (MNTooltips * self, cairo_t *cr)
- {
- #line 600 "mn-tooltips.c"
- #define __GOB_FUNCTION__ "MN:Tooltips::paint_window"
-@@ -608,13 +608,12 @@
- 	
-     GtkRequisition req;
- 
--    gtk_widget_size_request(selfp->window, &req);
--    gtk_paint_flat_box(selfp->window->style,
--		       selfp->window->window,
-+    gtk_widget_size_request(GTK_WIDGET(selfp), &req);
-+    gtk_paint_flat_box(gtk_widget_get_style(GTK_WIDGET(selfp)),
-+		       cr,
- 		       GTK_STATE_NORMAL,
- 		       GTK_SHADOW_OUT,
- 		       NULL,
--		       selfp->window,
- 		       "tooltip",
- 		       0,
- 		       0,
-@@ -651,10 +650,11 @@
-     gint monitor_num, px, py;
-     GdkRectangle monitor;
-     int screen_width;
-+    GtkAllocation allocation;
- 
-     if (! selfp->window)
-       self_force_window(self);
--    else if (GTK_WIDGET_VISIBLE(selfp->window))
-+    else if (gtk_widget_get_visible(selfp->window))
-       g_get_current_time(&selfp->last_popdown);
- 
-     gtk_widget_ensure_style(selfp->window);
-@@ -670,7 +670,7 @@
- 
-     data = selfp->active_data;
- 
--    child = GTK_BIN(selfp->window)->child;
-+    child = gtk_bin_get_child(GTK_BIN(selfp->window));
-     if (child)
-       gtk_container_remove(GTK_CONTAINER(selfp->window), child);
- 
-@@ -684,14 +684,16 @@
-     w = requisition.width;
-     h = requisition.height;
- 
--    gdk_window_get_origin(widget->window, &x, &y);
--    if (GTK_WIDGET_NO_WINDOW(widget))
-+    gtk_widget_get_allocation(selfp->window, &allocation);
-+
-+    gdk_window_get_origin(gtk_widget_get_window(widget), &x, &y);
-+    if (! gtk_widget_get_has_window(widget))
-       {
--	x += widget->allocation.x;
--	y += widget->allocation.y;
-+	x += allocation.x;
-+	y += allocation.y;
-       }
- 
--    x += widget->allocation.width / 2;
-+    x += allocation.width / 2;
- 
-     if (! keyboard_mode)
-       gdk_window_get_pointer(gdk_screen_get_root_window(screen), &x, NULL, NULL);
-@@ -712,11 +714,11 @@
-     else if (x < monitor.x)
-       x = monitor.x;
- 
--    if ((y + h + widget->allocation.height + 4) > monitor.y + monitor.height
-+    if ((y + h + allocation.height + 4) > monitor.y + monitor.height
- 	&& (y - 4) > monitor.y)
-       y = y - h - 4;
-     else
--      y = y + widget->allocation.height + 4;
-+      y = y + allocation.height + 4;
- 
-     /*
-      * The following block is not part of GTK+ and has been added to
-@@ -760,7 +762,7 @@
- 	
-     Self *self = SELF(data);
- 
--    if (selfp->active_data && GTK_WIDGET_DRAWABLE(selfp->active_data->widget))
-+    if (selfp->active_data && gtk_widget_is_drawable(selfp->active_data->widget))
-       self_draw_tips(self);
- 
-     selfp->timeout_id = 0;
-@@ -785,7 +787,7 @@
- 	
-     if (selfp->window)
-       {
--	if (GTK_WIDGET_VISIBLE(selfp->window))
-+	if (gtk_widget_get_visible(selfp->window))
- 	  g_get_current_time(&selfp->last_popdown);
- 	gtk_widget_hide(selfp->window);
-       }
-@@ -802,7 +804,7 @@
- 	{
- 	  TooltipsData *data = l->data;
- 
--	  if (data->widget == widget && GTK_WIDGET_DRAWABLE(widget))
-+	  if (data->widget == widget && gtk_widget_is_drawable(widget))
- 	    {
- 	      selfp->active_data = data;
- 	      break;
-@@ -937,7 +939,7 @@
- 
-     if (GTK_IS_WINDOW(toplevel))
-       {
--	GtkWidget *focus = GTK_WINDOW(toplevel)->focus_widget;
-+	GtkWidget *focus = gtk_window_get_focus(GTK_WINDOW(toplevel));
- 
- 	g_object_set_data(G_OBJECT(toplevel), TOOLTIPS_KEYBOARD_MODE, GINT_TO_POINTER(TRUE));
- 
-@@ -966,7 +968,7 @@
- 
-     if (GTK_IS_WINDOW(toplevel))
-       {
--	GtkWidget *focus = GTK_WINDOW(toplevel)->focus_widget;
-+	GtkWidget *focus = gtk_window_get_focus(GTK_WINDOW(toplevel));
- 
- 	if (focus)
- 	  self_hide_tip(focus);
-@@ -1057,24 +1059,24 @@
- 	    break;
- 
- 	  case GDK_ENTER_NOTIFY:
--	    if (! (GTK_IS_MENU_ITEM(widget) && GTK_MENU_ITEM(widget)->submenu))
-+	    if (! (GTK_IS_MENU_ITEM(widget) && gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget))))
- 	      self_start_delay(self, widget);
- 	    break;
- 
- 	  case GDK_LEAVE_NOTIFY:
- 	    self_set_active_widget(self, NULL);
--	    selfp->use_sticky_delay = selfp->window && GTK_WIDGET_VISIBLE(selfp->window);
-+	    selfp->use_sticky_delay = selfp->window && gtk_widget_get_visible(selfp->window);
- 	    break;
- 
- 	  case GDK_MOTION_NOTIFY:
- 	    /* Handle menu items specially ... pend popup for each motion
- 	     * on other widgets, we ignore motion.
- 	     */
--	    if (GTK_IS_MENU_ITEM(widget) && ! GTK_MENU_ITEM(widget)->submenu)
-+	    if (GTK_IS_MENU_ITEM(widget) && ! gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget)))
- 	      {
- 		/* Completely evil hack to make sure we get the LEAVE_NOTIFY
- 		 */
--		GTK_PRIVATE_SET_FLAG(widget, GTK_LEAVE_PENDING);
-+		//GTK_PRIVATE_SET_FLAG(widget, GTK_LEAVE_PENDING);
- 		self_set_active_widget(self, NULL);
- 		self_start_delay(self, widget);
- 		break;
---- src/nautilus-cell-renderer-pixbuf-emblem.c.orig	2011-02-08 00:16:43.847831409 +0100
-+++ src/nautilus-cell-renderer-pixbuf-emblem.c	2011-02-08 00:32:59.128682767 +0100
-@@ -39,17 +39,16 @@
-                                                           GtkWidget             *widget);
- static void nautilus_cell_renderer_pixbuf_emblem_get_size   (GtkCellRenderer            *cell,
-                                                  GtkWidget                  *widget,
--                                                 GdkRectangle               *rectangle,
-+                                                 const GdkRectangle               *rectangle,
-                                                  gint                       *x_offset,
-                                                  gint                       *y_offset,
-                                                  gint                       *width,
-                                                  gint                       *height);
- static void     nautilus_cell_renderer_pixbuf_emblem_render     (GtkCellRenderer            *cell,
--                                                          GdkWindow                  *window,
-+                                                          cairo_t                    *cr,
-                                                           GtkWidget                  *widget,
--                                                          GdkRectangle               *background_area,
--                                                          GdkRectangle               *cell_area,
--                                                          GdkRectangle               *expose_area,
-+                                                          const GdkRectangle               *background_area,
-+                                                          const GdkRectangle               *cell_area,
-                                                           GtkCellRendererState                       flags);
- 
- enum {
-@@ -356,7 +355,7 @@
- static void
- nautilus_cell_renderer_pixbuf_emblem_get_size (GtkCellRenderer *cell,
- 				   GtkWidget       *widget,
--				   GdkRectangle    *cell_area,
-+				   const GdkRectangle    *cell_area,
- 				   gint            *x_offset,
- 				   gint            *y_offset,
- 				   gint            *width,
-@@ -368,6 +367,10 @@
- 	gint pixbuf_height = 0;
- 	gint calc_width;
- 	gint calc_height;
-+	int xpad;
-+	int ypad;
-+	gfloat xalign;
-+	gfloat yalign;
- 
- 	if (!cellpixbuf->pixbuf && cellinfo->stock_id)
- 		nautilus_cell_renderer_pixbuf_emblem_create_stock_pixbuf (cellpixbuf, widget);
-@@ -385,8 +388,11 @@
- 		pixbuf_height = MAX (pixbuf_height, gdk_pixbuf_get_height (cellpixbuf->pixbuf_expander_closed));
- 	}
- 
--	calc_width  = (gint) cell->xpad * 2 + pixbuf_width;
--	calc_height = (gint) cell->ypad * 2 + pixbuf_height;
-+	gtk_cell_renderer_get_padding(cell, &xpad, &ypad);
-+	gtk_cell_renderer_get_alignment(cell, &xalign, &yalign);
-+
-+	calc_width  = (gint) xpad * 2 + pixbuf_width;
-+	calc_height = (gint) ypad * 2 + pixbuf_height;
- 
- 	if (x_offset) *x_offset = 0;
- 	if (y_offset) *y_offset = 0;
-@@ -394,14 +400,14 @@
- 	if (cell_area && pixbuf_width > 0 && pixbuf_height > 0) {
- 		if (x_offset) {
- 			*x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
--				1.0 - cell->xalign : cell->xalign) *
--				(cell_area->width - calc_width - 2 * cell->xpad));
--			*x_offset = MAX (*x_offset, 0) + cell->xpad;
-+				1.0 - xalign : xalign) *
-+				(cell_area->width - calc_width - 2 * xpad));
-+			*x_offset = MAX (*x_offset, 0) + xpad;
- 		}
- 		if (y_offset) {
--			*y_offset = (cell->yalign *
--				(cell_area->height - calc_height - 2 * cell->ypad));
--			*y_offset = MAX (*y_offset, 0) + cell->ypad;
-+			*y_offset = (yalign *
-+				(cell_area->height - calc_height - 2 * ypad));
-+			*y_offset = MAX (*y_offset, 0) + ypad;
- 		}
- 	}
- 
-@@ -414,11 +420,10 @@
- 
- static void
- nautilus_cell_renderer_pixbuf_emblem_render (GtkCellRenderer      *cell,
--                                 GdkWindow            *window,
-+                                 cairo_t              *cr,
-                                  GtkWidget            *widget,
--                                 GdkRectangle         *background_area,
--                                 GdkRectangle         *cell_area,
--                                 GdkRectangle         *expose_area,
-+                                 const GdkRectangle   *background_area,
-+                                 const GdkRectangle   *cell_area,
-                                  GtkCellRendererState  flags)
- 
- {
-@@ -429,13 +434,19 @@
- 	GdkRectangle pix_emblem_rect;
- 	GdkRectangle draw_rect;
- 	gboolean stock_pixbuf = FALSE;
-+	gboolean is_expander = FALSE;
-+	gboolean is_expanded = FALSE;
-+	int xpad;
-+	int ypad;
-+
-+	g_object_get(cell, "is-expander", &is_expander, "is-expanded", &is_expanded, NULL);
- 
- 	pixbuf = cellpixbuf->pixbuf;
--	if (cell->is_expander) {
--		if (cell->is_expanded &&
-+	if (is_expander) {
-+		if (is_expanded &&
- 		    cellpixbuf->pixbuf_expander_open != NULL) {
- 			pixbuf = cellpixbuf->pixbuf_expander_open;
--		} else if (!cell->is_expanded &&
-+		} else if (!is_expanded &&
- 			   cellpixbuf->pixbuf_expander_closed != NULL) {
- 			pixbuf = cellpixbuf->pixbuf_expander_closed;
- 		}
-@@ -456,15 +467,20 @@
- 	if (stock_pixbuf)
- 		pixbuf = cellpixbuf->pixbuf;
- 
-+	gtk_cell_renderer_get_padding(cell, &xpad, &ypad);
-+
- 	pix_rect.x += cell_area->x;
- 	pix_rect.y += cell_area->y;
--	pix_rect.width  -= cell->xpad * 2;
--	pix_rect.height -= cell->ypad * 2;
-+	pix_rect.width  -= xpad * 2;
-+	pix_rect.height -= ypad * 2;
- 
-+	if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect)) {
-+#if 0
- 	if (gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect) &&
- 	    gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect)) {
-+
- 		gdk_draw_pixbuf (window,
--			widget->style->black_gc,
-+			gtk_widget_get_style(widget)->black_gc,
- 			pixbuf,
- 			/* pixbuf 0, 0 is at pix_rect.x, pix_rect.y */
- 			draw_rect.x - pix_rect.x,
-@@ -475,6 +491,11 @@
- 			draw_rect.height,
- 			GDK_RGB_DITHER_NORMAL,
- 			0, 0);
-+#endif
-+
-+		cairo_move_to (cr, draw_rect.x - pix_rect.x, draw_rect.y - pix_rect.y);
-+		gdk_cairo_set_source_pixbuf (cr, pixbuf, draw_rect.x, draw_rect.y);
-+		cairo_paint (cr);
- 	}
- 
- 	if (cellpixbuf->pixbuf_emblem) {
-@@ -482,8 +503,11 @@
- 		pix_emblem_rect.height = gdk_pixbuf_get_height (cellpixbuf->pixbuf_emblem);
- 		pix_emblem_rect.x = pix_rect.x;
- 		pix_emblem_rect.y = pix_rect.y + pix_rect.height - pix_emblem_rect.height;
-+		if (gdk_rectangle_intersect (cell_area, &pix_emblem_rect, &draw_rect)) {
-+#if 0
- 		if (gdk_rectangle_intersect (cell_area, &pix_emblem_rect, &draw_rect) &&
- 		    gdk_rectangle_intersect (expose_area, &draw_rect, &draw_rect)) {
-+
- 			gdk_draw_pixbuf (window,
- 				widget->style->black_gc,
- 				cellpixbuf->pixbuf_emblem,
-@@ -496,6 +520,11 @@
- 				draw_rect.height,
- 				GDK_RGB_DITHER_NORMAL,
- 				0, 0);
-+#endif
-+
-+			cairo_move_to (cr, draw_rect.x - pix_emblem_rect.x, draw_rect.y - pix_emblem_rect.y);
-+			gdk_cairo_set_source_pixbuf (cr, cellpixbuf->pixbuf_emblem, draw_rect.x, draw_rect.y);
-+			cairo_paint (cr);
- 		}
- 	}
- }
---- src/nautilus-cell-renderer-pixbuf-emblem.h.orig	2011-02-07 22:18:12.336471764 +0100
-+++ src/nautilus-cell-renderer-pixbuf-emblem.h	2011-02-08 00:20:30.461758697 +0100
-@@ -25,18 +25,18 @@
- #ifndef NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_H
- #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_H
- 
--#include <gtk/gtkcellrenderer.h>
-+#include <gtk/gtk.h>
- 
- #define NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM \
- 	(nautilus_cell_renderer_pixbuf_emblem_get_type ())
- #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM(obj) \
--	(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblem))
-+	(G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblem))
- #define NAUTILUS_CELL_RENDERER_PIXBUF_EMBLEM_CLASS(klass) \
--	(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblemClass))
-+	(G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM, NautilusCellRendererPixbufEmblemClass))
- #define NAUTILUS_IS_CELL_RENDERER_PIXBUF_EMBLEM(obj) \
--	(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM))
-+	(G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM))
- #define NAUTILUS_IS_CELL_RENDERER_PIXBUF_EMBLEM_CLASS(klass) \
--	(GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM))
-+	(G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_CELL_RENDERER_PIXBUF_EMBLEM))
- 
- typedef struct _NautilusCellRendererPixbufEmblem NautilusCellRendererPixbufEmblem;
- typedef struct _NautilusCellRendererPixbufEmblemClass NautilusCellRendererPixbufEmblemClass;
---- build/src/mn-authenticated-mailbox.c.orig	2011-02-08 00:34:16.332610802 +0100
-+++ build/src/mn-authenticated-mailbox.c	2011-02-08 00:36:23.706936717 +0100
-@@ -25,7 +25,7 @@
- #line 29 "src/mn-authenticated-mailbox.gob"
- 
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include "mn-mailbox-private.h"
- #include "mn-shell.h"
- #include "mn-util.h"
-@@ -859,6 +859,7 @@
- 
-     /* keep the title in sync with gnome-authentication-manager */
- 
-+#if 0
-     /* translators: header capitalization */
-     selfp->auth_dialog = gnome_password_dialog_new(_("Authentication Required"),
- 						   message,
-@@ -891,6 +892,9 @@
-     gtk_widget_destroy(selfp->auth_dialog);
- 
-     return ok;
-+#else
-+    return FALSE;
-+#endif
-   }}
- #line 896 "mn-authenticated-mailbox.c"
- #undef __GOB_FUNCTION__
---- build/src/mn-about-dialog.c.orig	2011-02-08 22:20:54.469841262 +0100
-+++ build/src/mn-about-dialog.c	2011-02-08 22:21:13.309839037 +0100
-@@ -111,9 +111,11 @@
-  {
- #line 32 "src/mn-about-dialog.gob"
- 
-+#if 0
-     gtk_about_dialog_set_email_hook(self_activate_link_cb, "mailto:", NULL);
-     gtk_about_dialog_set_url_hook(self_activate_link_cb, NULL, NULL);
--  
-+#endif
-+
- #line 118 "mn-about-dialog.c"
-  }
- }
---- build/src/mn-autodetect-mailbox-properties.c.orig	2011-02-08 22:21:58.639427345 +0100
-+++ build/src/mn-autodetect-mailbox-properties.c	2011-02-08 22:22:43.564035901 +0100
-@@ -355,10 +355,9 @@
- 
-     toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button));
-     /* translators: header capitalization */
--    selfp->chooser = gtk_file_chooser_dialog_new_with_backend(_("Select a File or Folder"),
-+    selfp->chooser = gtk_file_chooser_dialog_new(_("Select a File or Folder"),
- 							      GTK_WINDOW(toplevel),
- 							      GTK_FILE_CHOOSER_ACTION_OPEN,
--							      "gnome-vfs",
- 							      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- 							      GTK_STOCK_OPEN, 1,
- 							      NULL);
---- build/src/mn-pi-mailbox-properties.c.orig	2011-02-08 22:30:08.051375715 +0100
-+++ build/src/mn-pi-mailbox-properties.c	2011-02-08 22:30:21.398665261 +0100
-@@ -415,7 +415,7 @@
-     int i;
- 
-     for (i = 0; i < MN_PI_MAILBOX_N_CONNECTION_TYPES; i++)
--      gtk_widget_set_sensitive(self->port_spin[i], GTK_WIDGET_SENSITIVE(self->conn_radio[i]) && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self->conn_radio[i])));
-+      gtk_widget_set_sensitive(self->port_spin[i], gtk_widget_get_sensitive(self->conn_radio[i]) && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self->conn_radio[i])));
- 
-     g_object_notify(G_OBJECT(self), "complete");
-   }}
---- src/eggtrayicon.c.orig	2011-02-07 23:42:30.405791829 +0100
-+++ src/eggtrayicon.c	2011-02-08 23:06:16.092968325 +0100
-@@ -25,7 +25,7 @@
- 
- #include "eggtrayicon.h"
- 
--#include <gdkconfig.h>
-+#include <gdk/gdk.h>
- #if defined (GDK_WINDOWING_X11)
- #include <gdk/gdkx.h>
- #include <X11/Xatom.h>
-@@ -258,7 +258,7 @@
-     {
-       GdkWindow *gdkwin;
- 
--      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget),
-+      gdkwin = gdk_x11_window_lookup_for_display (gtk_widget_get_display (widget),
-                                               icon->manager_window);
- 
-       gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-@@ -290,7 +290,7 @@
-   ev.window = window;
-   ev.message_type = icon->system_tray_opcode_atom;
-   ev.format = 32;
--  ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window);
-+  ev.data.l[0] = gdk_x11_get_server_time (gtk_widget_get_window(GTK_WIDGET (icon)));
-   ev.data.l[1] = message;
-   ev.data.l[2] = data1;
-   ev.data.l[3] = data2;
-@@ -342,12 +342,12 @@
-     {
-       GdkWindow *gdkwin;
- 
--      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-+      gdkwin = gdk_x11_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
- 					      icon->manager_window);
- 
-       gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
- 
--      if (dock_if_realized && GTK_WIDGET_REALIZED (icon))
-+      if (dock_if_realized && gtk_widget_get_realized (GTK_WIDGET(icon)))
- 	egg_tray_icon_send_dock_request (icon);
- 
-       egg_tray_icon_get_orientation_property (icon);
-@@ -355,10 +355,16 @@
- }
- 
- static gboolean
--transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
-+transparent_draw (GtkWidget *widget, cairo_t *cr, gpointer user_data)
- {
--  gdk_window_clear_area (widget->window, event->area.x, event->area.y,
-+#if 0
-+  gdk_window_clear_area (gtk_widget_get_window(widget), event->area.x, event->area.y,
- 			 event->area.width, event->area.height);
-+#endif
-+  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
-+  //gdk_cairo_region (cr, event->region);
-+  cairo_fill (cr);
-+
-   return FALSE;
- }
- 
-@@ -366,20 +372,20 @@
- make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
- 			gpointer user_data)
- {
--  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
-+  //gdk_window_set_back_pixmap (gtk_widget_get_window(widget), NULL, TRUE);
- }
- 
- static void
- make_transparent (GtkWidget *widget, gpointer user_data)
- {
--  if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
-+  if (! gtk_widget_get_has_window (widget) || gtk_widget_get_app_paintable (widget))
-     return;
- 
-   gtk_widget_set_app_paintable (widget, TRUE);
-   gtk_widget_set_double_buffered (widget, FALSE);
--  gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
--  g_signal_connect (widget, "expose_event",
--		    G_CALLBACK (transparent_expose_event), NULL);
-+  //gdk_window_set_back_pixmap (gtk_widget_get_window(widget), NULL, TRUE);
-+  g_signal_connect (widget, "draw",
-+		    G_CALLBACK (transparent_draw), NULL);
-   g_signal_connect_after (widget, "style_set",
- 			  G_CALLBACK (make_transparent_again), NULL);
- }
-@@ -391,7 +397,7 @@
- 
-   g_return_if_fail (icon->manager_window != None);
- 
--  gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-+  gdkwin = gdk_x11_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
- 					  icon->manager_window);
- 
-   gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
---- build/src/mn-properties-dialog.c.orig	2011-02-08 23:37:12.605200174 +0100
-+++ build/src/mn-properties-dialog.c	2011-02-08 23:37:18.601881191 +0100
-@@ -183,7 +183,7 @@
-     GtkTreeSelection *selection;
- 
-     mn_container_create_interface(GTK_CONTAINER(self),
--				  PKGDATADIR G_DIR_SEPARATOR_S "properties-dialog.glade",
-+				  PKGDATADIR G_DIR_SEPARATOR_S "properties-dialog.ui",
- 				  "main_vbox",
- 				  "mn_properties_dialog_",
- 				  "notebook", &selfp->notebook,
---- src/mn-util.c.orig	2011-02-08 00:01:25.167207512 +0100
-+++ src/mn-util.c	2011-02-09 00:01:35.718285446 +0100
-@@ -26,8 +26,7 @@
- #include <gmodule.h>
- #include <glib/gi18n.h>
- #include <gobject/gvaluecollector.h>
--#include <gnome.h>
--#include <glade/glade.h>
-+#include <libgnome/libgnome.h>
- #include "mn-util.h"
- #include "mn-mailboxes.h"
- #include "mn-shell.h"
-@@ -303,49 +302,55 @@
-   return pixbuf;
- }
- 
--static GladeXML *
-+static GtkBuilder *
- mn_glade_xml_new (const char *filename, const char *root, const char *domain)
- {
--  GladeXML *xml;
-+  GtkBuilder *builder;
-+  GError *err = NULL;
- 
-   g_return_val_if_fail(filename != NULL, NULL);
- 
--  xml = glade_xml_new(filename, root, domain);
--  if (! xml)
--    mn_show_fatal_error_dialog(NULL, "Unable to load interface \"%s\".", filename);
-+  builder = gtk_builder_new();
-+  gtk_builder_set_translation_domain(builder, domain);
-+  if (! gtk_builder_add_from_file(builder, filename, &err)) {
-+    mn_show_fatal_error_dialog(NULL, "Unable to load interface \"%s\": %s.", filename, err->message);
-+    g_error_free(err);
-+    g_object_unref(builder);
-+    return NULL;
-+  }
- 
--  return xml;
-+  return builder;
- }
- 
- static GtkWidget *
--mn_glade_xml_get_widget (GladeXML *xml, const char *widget_name)
-+mn_glade_xml_get_widget (GtkBuilder *builder, const char *widget_name)
- {
-   GtkWidget *widget;
- 
--  g_return_val_if_fail(GLADE_IS_XML(xml), NULL);
-+  g_return_val_if_fail(GTK_IS_BUILDER(builder), NULL);
-   g_return_val_if_fail(widget_name != NULL, NULL);
- 
--  widget = glade_xml_get_widget(xml, widget_name);
-+  widget = GTK_WIDGET(gtk_builder_get_object(builder, widget_name));
-   if (! widget)
--    mn_show_fatal_error_dialog(NULL, "Widget \"%s\" not found in interface \"%s\".", widget_name, xml->filename);
-+    mn_show_fatal_error_dialog(NULL, "Widget \"%s\" not found in interface.", widget_name);
- 
-   return widget;
- }
- 
- static void
--create_interface_connect_cb (const char *handler_name,
-+create_interface_connect_cb (GtkBuilder *builder,
- 			     GObject *object,
- 			     const char *signal_name,
--			     const char *signal_data,
-+			     const char *handler_name,
- 			     GObject *connect_object,
--			     gboolean after,
-+                             GConnectFlags flags,
- 			     gpointer user_data)
- {
-   static GModule *module = NULL;
-   ContainerCreateInterfaceConnectInfo *info = user_data;
-   char *cb_name;
-   GCallback cb;
--  GConnectFlags flags;
-+  GConnectFlags cflags;
- 
-   if (! module)
-     {
-@@ -359,11 +364,9 @@
-     mn_show_fatal_error_dialog(NULL, "Signal handler \"%s\" not found.", cb_name);
-   g_free(cb_name);
- 
--  flags = G_CONNECT_SWAPPED;
--  if (after)
--    flags |= G_CONNECT_AFTER;
-+  cflags = G_CONNECT_SWAPPED;
- 
--  g_signal_connect_data(object, signal_name, cb, info->container, NULL, flags);
-+  g_signal_connect_data(object, signal_name, cb, info->container, NULL, cflags);
- }
- 
- void
-@@ -373,7 +376,7 @@
- 			       const char *callback_prefix,
- 			       ...)
- {
--  GladeXML *xml;
-+  GtkBuilder *xml;
-   GtkWidget *child;
-   ContainerCreateInterfaceConnectInfo info;
-   va_list args;
-@@ -387,14 +390,16 @@
-   xml = mn_glade_xml_new(filename, child_name, NULL);
-   child = mn_glade_xml_get_widget(xml, child_name);
- 
--  if (GTK_IS_DIALOG(container))
--    gtk_box_pack_start(GTK_BOX(GTK_DIALOG(container)->vbox), child, TRUE, TRUE, 0);
--  else
-+  if (GTK_IS_DIALOG(container)) {
-+    gtk_widget_unparent(child);
-+    gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(container))), child, TRUE, TRUE, 0);
-+  } else {
-     gtk_container_add(container, child);
-+  }
- 
-   info.container = container;
-   info.callback_prefix = callback_prefix;
--  glade_xml_signal_autoconnect_full(xml, create_interface_connect_cb, &info);
-+  gtk_builder_connect_signals_full(xml, create_interface_connect_cb, &info);
- 
-   va_start(args, callback_prefix);
- 
-@@ -422,7 +427,7 @@
- 
-   toplevel = gtk_widget_get_toplevel(widget);
- 
--  return GTK_WIDGET_TOPLEVEL(toplevel) ? GTK_WINDOW(toplevel) : NULL;
-+  return gtk_widget_get_toplevel(toplevel) ? GTK_WINDOW(toplevel) : NULL;
- }
- 
- static void
-@@ -493,9 +498,11 @@
- 			       gpointer user_data)
- {
-   GtkAdjustment *adjustment;
-+  GtkAllocation allocation;
- 
-+  gtk_widget_get_allocation(widget, &allocation);
-   adjustment = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(widget));
--  gtk_adjustment_set_value(adjustment, (double) y / (widget->allocation.height - 2) * (adjustment->upper - adjustment->page_size));
-+  gtk_adjustment_set_value(adjustment, (double) y / (allocation.height - 2) * (gtk_adjustment_get_upper(adjustment) - gtk_adjustment_get_page_size(adjustment)));
- 
-   return TRUE;			/* we're forcibly in a drop zone */
- }
-@@ -562,7 +569,7 @@
- 	MNMailbox *mailbox;
- 
- 	/* text/x-moz-url is encoded in UCS-2 but in format 8: broken */
--	if (selection_data->format != 8 || selection_data->length <= 0 || (selection_data->length % 2) != 0)
-+	if (gtk_selection_data_get_format(selection_data) != 8 || gtk_selection_data_get_length(selection_data) <= 0 || (gtk_selection_data_get_length(selection_data) % 2) != 0)
- 	  {
- 	    mn_show_error_dialog(mn_widget_get_parent_window(widget),
- 				 _("A drag and drop error has occurred"),
-@@ -570,8 +577,8 @@
- 	    return;
- 	  }
- 
--	char_data = (const guint16 *) selection_data->data;
--	char_len = selection_data->length / 2;
-+	char_data = (const guint16 *) gtk_selection_data_get_data(selection_data);
-+	char_len = gtk_selection_data_get_length(selection_data) / 2;
- 
- 	url = g_string_new(NULL);
- 	for (i = 0; i < char_len && char_data[i] != '\n'; i++)
-@@ -1322,7 +1329,7 @@
- }
- 
- static void
--dialog_run_nonmodal_destroy_h (GtkObject *object, gpointer user_data)
-+dialog_run_nonmodal_destroy_h (GtkWidget *object, gpointer user_data)
- {
-   RunNonmodalInfo *info = user_data;
- 
-@@ -1375,7 +1382,7 @@
- 
-   g_object_ref(dialog);
- 
--  if (! GTK_WIDGET_VISIBLE(dialog))
-+  if (! gtk_widget_get_visible(dialog))
-     gtk_widget_show(GTK_WIDGET(dialog));
- 
-   g_object_connect(dialog,
---- src/mn-main.c.gtk3	2008-05-22 17:45:35.000000000 +0200
-+++ src/mn-main.c	2011-02-08 23:32:33.800030659 +0100
-@@ -21,7 +21,7 @@
- #include <stdlib.h>
- #include <signal.h>
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include <libgnomevfs/gnome-vfs.h>
- #include <libnotify/notify.h>
- #include <dbus/dbus-glib-lowlevel.h>
-@@ -452,7 +452,7 @@
- 
-   gnome_program_init(PACKAGE,
- 		     VERSION,
--		     LIBGNOMEUI_MODULE,
-+		     LIBGNOME_MODULE,
- 		     argc,
- 		     argv,
- 		     GNOME_PARAM_HUMAN_READABLE_NAME, _("Mail Notification"),
-@@ -460,6 +460,8 @@
- 		     GNOME_PARAM_GOPTION_CONTEXT, option_context,
- 		     NULL);
- 
-+  gtk_init(&argc, &argv);
-+
-   if (arg_version)
-     {
-       print_version();
-@@ -497,7 +499,9 @@
- 	  if (! gnome_vfs_init())
- 	    mn_show_fatal_error_dialog(NULL, _("Unable to initialize the GnomeVFS library."));
- 
-+#if 0
- 	  gnome_authentication_manager_init();
-+#endif
- 
- 	  /* must be called before init_gmime() */
- 	  mn_conf_init();
---- src/mn-conf.c.gtk3	2008-05-22 17:45:35.000000000 +0200
-+++ src/mn-conf.c	2011-02-07 20:07:01.630580132 +0100
-@@ -23,7 +23,7 @@
- #include <errno.h>
- #include <stdarg.h>
- #include <glib/gi18n.h>
--#include <gnome.h>
-+#include <libgnome/libgnome.h>
- #include "mn-util.h"
- #include "mn-conf.h"
- #include "mn-shell.h"
diff --git a/testing/mail-notification/mail-notification-5.4-icons.patch b/testing/mail-notification/mail-notification-5.4-icons.patch
deleted file mode 100644
index 48d54742a..000000000
--- a/testing/mail-notification/mail-notification-5.4-icons.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nrbu mail-notification-5.4/src/mn-stock.c mail-notification-5.4-OK/src/mn-stock.c
---- mail-notification-5.4/src/mn-stock.c	2008-05-22 19:45:35.000000000 +0400
-+++ mail-notification-5.4-OK/src/mn-stock.c	2010-05-24 19:36:03.000000000 +0400
-@@ -32,11 +32,11 @@
-     const char	*icon_name;
-     const char	*source_stock_id;
-   } icons[] = {
--    { MN_STOCK_MAIL,			NULL, "stock_mail" },
--    { MN_STOCK_NO_MAIL,			NULL, "stock_inbox" },
--    { MN_STOCK_LOCAL,			NULL, "stock_folder" },
--    { MN_STOCK_REMOTE,			NULL, "stock_internet" },
--    { MN_STOCK_UNKNOWN,			NULL, "stock_unknown" },
-+    { MN_STOCK_MAIL,			NULL, "mail-message-new" },
-+    { MN_STOCK_NO_MAIL,			NULL, "mail-notification" },
-+    { MN_STOCK_LOCAL,			NULL, "folder" },
-+    { MN_STOCK_REMOTE,			NULL, "applications-internet" },
-+    { MN_STOCK_UNKNOWN,			NULL, "dialog-question" },
-     { MN_STOCK_ERROR,			NULL, NULL, GTK_STOCK_DIALOG_ERROR },
- #if WITH_GMAIL
-     { MN_STOCK_GMAIL,			PKGDATADIR G_DIR_SEPARATOR_S "gmail.png" },
-@@ -48,14 +48,14 @@
-     { MN_STOCK_HOTMAIL,			PKGDATADIR G_DIR_SEPARATOR_S "hotmail.png" },
- #endif
- #if WITH_MBOX || WITH_MOZILLA || WITH_MH || WITH_MAILDIR || WITH_SYLPHEED
--    { MN_STOCK_SYSTEM_MAILBOX,		NULL, "system" },
-+    { MN_STOCK_SYSTEM_MAILBOX,		NULL, "applications-system" },
- #endif
- #if WITH_EVOLUTION
-     { MN_STOCK_EVOLUTION_MAILBOX,	NULL, "evolution" },
- #endif
--    { MN_STOCK_MAIL_READER,		NULL, "stock_mail-handling" },
--    { MN_STOCK_OPEN_MESSAGE,		NULL, "stock_mail-open" },
--    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "stock_mark" }
-+    { MN_STOCK_MAIL_READER,		NULL, "mail-unread" },
-+    { MN_STOCK_OPEN_MESSAGE,		NULL, "mail-read" },
-+    { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "mail-mark-read" }
-   };
-   GtkIconFactory *factory;
-   GtkIconTheme *icon_theme;
diff --git a/testing/mail-notification/mail-notification-5.4-kde-trayicon.patch b/testing/mail-notification/mail-notification-5.4-kde-trayicon.patch
deleted file mode 100644
index a3bdc8372..000000000
--- a/testing/mail-notification/mail-notification-5.4-kde-trayicon.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-shell.c mail-notification-5.4-OK/build/src/mn-shell.c
---- mail-notification-5.4/build/src/mn-shell.c	2010-10-11 17:45:23.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-shell.c	2010-10-11 17:45:48.000000000 +0400
-@@ -313,6 +313,29 @@
- #undef __GOB_FUNCTION__
- 
- static void 
-+mn_shell_init_icon_base (MNShell * self)
-+{
-+    g_return_if_fail (self != NULL);
-+    g_return_if_fail (MN_IS_SHELL (self));
-+
-+    self->icon = MN_MAIL_ICON(mn_mail_icon_new());
-+    mn_add_weak_pointer(&self->icon);
-+
-+    g_object_connect(self->icon,
-+                     "signal::activate", self_icon_activate_h, self,
-+                     "signal::activate-mail-reader", self_icon_activate_mail_reader_h, self,
-+                     "signal::activate-open-latest-message", self_icon_activate_open_latest_message_h, self,
-+                     "swapped-signal::activate-consider-new-mail-as-read", self_consider_new_mail_as_read, self,
-+                     "swapped-signal::activate-update", self_update, self,
-+                     "signal::activate-properties", self_icon_activate_properties_h, self,
-+                     "signal::activate-help", self_icon_activate_help_h, self,
-+                     "signal::activate-about", self_icon_activate_about_h, self,
-+                     "swapped-signal::activate-remove", self_quit, self,
-+                     "signal::destroy", self_icon_destroy_h, self,
-+                     NULL);
-+}
-+
-+static void 
- mn_shell_init (MNShell * o G_GNUC_UNUSED)
- {
- #define __GOB_FUNCTION__ "MN:Shell::init"
-@@ -793,22 +816,7 @@
- {
- #line 360 "src/mn-shell.gob"
- 	
--    self->icon = MN_MAIL_ICON(mn_mail_icon_new());
--    mn_add_weak_pointer(&self->icon);
--
--    g_object_connect(self->icon,
--		     "signal::activate", self_icon_activate_h, self,
--		     "signal::activate-mail-reader", self_icon_activate_mail_reader_h, self,
--		     "signal::activate-open-latest-message", self_icon_activate_open_latest_message_h, self,
--		     "swapped-signal::activate-consider-new-mail-as-read", self_consider_new_mail_as_read, self,
--		     "swapped-signal::activate-update", self_update, self,
--		     "signal::activate-properties", self_icon_activate_properties_h, self,
--		     "signal::activate-help", self_icon_activate_help_h, self,
--		     "signal::activate-about", self_icon_activate_about_h, self,
--		     "swapped-signal::activate-remove", self_quit, self,
--		     "signal::destroy", self_icon_destroy_h, self,
--		     NULL);
--
-+    mn_shell_init_icon_base(self);
-     self_update_sensitivity(self);
-     self_update_tooltip(self);
-     self_update_icon(self);
-@@ -1094,7 +1102,13 @@
-       }
-     else
-       {
--	gtk_widget_hide(GTK_WIDGET(self->icon));
-+	/* Re-create the icon as a regular gtk_widget_hide causes the
-+	 * icon to remain visible on non-GNOME environments. We can't
-+	 * use the callback self_icon_destroy_h here as it can cause an
-+	 * endless recursion */
-+	g_signal_handlers_disconnect_by_func(self->icon, self_icon_destroy_h, self);
-+	gtk_widget_destroy(GTK_WIDGET(self->icon));
-+	mn_shell_init_icon_base(self);
- 	mn_mail_icon_set_blinking(self->icon, FALSE);
-       }
-   }}
diff --git a/testing/mail-notification/mail-notification-5.4-popup-attach.patch b/testing/mail-notification/mail-notification-5.4-popup-attach.patch
deleted file mode 100644
index b8d5f6a09..000000000
--- a/testing/mail-notification/mail-notification-5.4-popup-attach.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-popup.c mail-notification-5.4-OK/build/src/mn-popup.c
---- mail-notification-5.4/build/src/mn-popup.c	2008-05-22 19:47:49.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-popup.c	2010-10-11 17:42:32.000000000 +0400
-@@ -177,6 +177,29 @@
- #undef __GOB_FUNCTION__
- 
- static void 
-+mn_popup_wait_for_icon_to_become_ready (void)
-+{
-+    int x, y;
-+    int count = 0;
-+
-+    /* When the tray icon is created, it can still take some time before
-+     * it has arrived at the correct position. This is especially the case
-+     * on KDE environments. To work around this, add a little delay of at
-+     * most 2 seconds before showing a popup which is attached to the notification */
-+    do {
-+        gdk_window_get_origin (gtk_widget_get_window (mn_shell->icon), &x, &y);
-+
-+        if (x != 0 || y != 0) {
-+            break;
-+        }
-+
-+        g_usleep(G_USEC_PER_SEC / 10);
-+        count++;
-+    } while (count < 20);
-+}
-+
-+
-+static void 
- mn_popup_init (MNPopup * o G_GNUC_UNUSED)
- {
- #define __GOB_FUNCTION__ "MN:Popup::init"
-@@ -299,8 +322,10 @@
- 		 "icon-name", "stock_mail",
- 		 NULL);
- 
--    if (mn_conf_get_enum_value(MN_TYPE_POPUP_POSITION, MN_CONF_POPUPS_POSITION) == MN_POPUP_POSITION_ATTACHED)
-+    if (mn_conf_get_enum_value(MN_TYPE_POPUP_POSITION, MN_CONF_POPUPS_POSITION) == MN_POPUP_POSITION_ATTACHED) {
-+      mn_popup_wait_for_icon_to_become_ready();
-       g_object_set(self, "attach-widget", mn_shell->icon, NULL);
-+    }
- 
-     g_string_free(body, TRUE);
- 
diff --git a/testing/mail-notification/mail-notification-5.4-sasl_encode64.patch b/testing/mail-notification/mail-notification-5.4-sasl_encode64.patch
deleted file mode 100644
index 80a7304d1..000000000
--- a/testing/mail-notification/mail-notification-5.4-sasl_encode64.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up mail-notification-5.4/build/src/mn-pop3-mailbox.c mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c
---- mail-notification-5.4/build/src/mn-pop3-mailbox.c	2009-05-19 10:29:58.448201837 +0200
-+++ mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c	2009-05-19 10:23:29.356204287 +0200
-@@ -619,7 +619,7 @@ mn_pop3_mailbox_enter_auth_cb (MNClientS
- 
- 	if (initial_clientoutlen > 0)
- 	  {
--	    char buf64[initial_clientoutlen * 2]; /* Base64 is 33% larger than the data it encodes */
-+	    char buf64[initial_clientoutlen * 2 + 1]; /* Base64 is 33% larger than the data it encodes */
- 	    unsigned int outlen;
- 	    int result;
- 	    char *str;
-diff -up mail-notification-5.4/src/mn-client-session.c mail-notification-5.4-OK/src/mn-client-session.c
---- mail-notification-5.4/src/mn-client-session.c	2008-05-22 17:45:35.000000000 +0200
-+++ mail-notification-5.4-OK/src/mn-client-session.c	2009-05-19 10:29:09.112211055 +0200
-@@ -1030,7 +1030,7 @@ mn_client_session_write (MNClientSession
- static int
- write_base64 (MNClientSession *session, const char *buf, unsigned int len)
- {
--  char buf64[len * 2];		/* Base64 is 33% larger than the data it encodes */
-+  char buf64[len * 2 + 1];		/* Base64 is 33% larger than the data it encodes */
-   unsigned int outlen;
-   int result;
-   char *str;
diff --git a/testing/mail-notification/mail-notification-5.4-weak.patch b/testing/mail-notification/mail-notification-5.4-weak.patch
deleted file mode 100644
index 2e2a233aa..000000000
--- a/testing/mail-notification/mail-notification-5.4-weak.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nrbu mail-notification-5.4/build/src/mn-shell.c mail-notification-5.4-OK/build/src/mn-shell.c
---- mail-notification-5.4/build/src/mn-shell.c	2008-05-22 19:47:49.000000000 +0400
-+++ mail-notification-5.4-OK/build/src/mn-shell.c	2010-05-24 19:39:48.000000000 +0400
-@@ -1008,6 +1008,7 @@
-     Self *self = user_data;
- 
-     /* The Notification Area applet has been terminated. Recreate the icon. */
-+    mn_remove_weak_pointer(&self->icon);
-     self_init_icon(self);
-   }}
- #line 1014 "mn-shell.c"
diff --git a/testing/mail-notification/mail-notification.install b/testing/mail-notification/mail-notification.install
deleted file mode 100644
index 21cd94399..000000000
--- a/testing/mail-notification/mail-notification.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=mail-notification
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  kill -s HUP `pidof bonobo-activation-server` > /dev/null 2>&1
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  kill -s HUP `pidof bonobo-activation-server` > /dev/null 2>&1
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/mail-notification/remove-ubuntu-special-case.patch b/testing/mail-notification/remove-ubuntu-special-case.patch
deleted file mode 100644
index 4516f32c6..000000000
--- a/testing/mail-notification/remove-ubuntu-special-case.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- jbsrc/lib/src/core/jb-feature.c.~1~	2008-04-27 16:47:27.000000000 +0200
-+++ jbsrc/lib/src/core/jb-feature.c	2008-07-22 11:40:50.856886210 +0200
-@@ -164,8 +164,6 @@
- static void
- gconf_configure (void)
- {
--  JBVariable *variable;
--
-   jb_require_program("gconftool-2");
- 
-   if (! strcmp(jb_variable_get_string("gconf-config-source"), "autodetect"))
-@@ -178,21 +176,6 @@
-       jb_variable_set_string("gconf-config-source", config_source);
-       g_free(config_source);
-     }
--
--  /* fix the default schemas dir on Ubuntu */
--  variable = jb_variable_get_variable_or_error("gconf-schemas-dir");
--  if (! variable->user_set)
--    {
--      static const char *ubuntu_dir = "$datadir/gconf/schemas";
--      char *expanded;
--
--      expanded = jb_variable_expand(ubuntu_dir, NULL);
--
--      if (g_file_test(expanded, G_FILE_TEST_IS_DIR))
--	jb_variable_set_string("gconf-schemas-dir", ubuntu_dir);
--
--      g_free(expanded);
--    }
- }
- 
- static void
diff --git a/testing/metacity/PKGBUILD b/testing/metacity/PKGBUILD
deleted file mode 100644
index e72415fec..000000000
--- a/testing/metacity/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 118084 2011-04-05 11:18:53Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=metacity
-pkgver=2.34.0
-pkgrel=1
-pkgdesc="A window manager for GNOME2"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'libgtop' 'libwnck' 'libsm')
-makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils' 'gnome-common')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=metacity.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('e316beff76658c98e21ddf4e7eaba12cd761b35002dc38701441db6740a6d698')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/metacity \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain metacity ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/metacity/metacity.install b/testing/metacity/metacity.install
deleted file mode 100644
index 2eb1e5094..000000000
--- a/testing/metacity/metacity.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=metacity
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/midori/PKGBUILD b/testing/midori/PKGBUILD
deleted file mode 100644
index 00c16135b..000000000
--- a/testing/midori/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 118802 2011-04-07 20:14:30Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: rabyte <rabyte.at.gmail.dot.com>
-# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
-
-pkgname=midori
-#_gitdate=20090306
-pkgver=0.3.3 #_git${_gitdate}
-pkgrel=2
-pkgdesc="A lightweight web browser based on Gtk WebKit"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-license=('LGPL2.1')
-install=midori.install
-depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss' 'sqlite3' 'glib2')
-makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git'
-optdepends=('vala: for use in extensions')
-source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2
-	#midori-${_gitdate}.tar.bz2
-)
-md5sums=('e1262cc7cc0c1773c331ab794480f037')
-
-# source PKGBUILD && mksource
-mksource() {
-        mkdir /tmp/$pkgname-source
-        pushd /tmp/$pkgname-source
-	git clone -v git://git.xfce.org/kalikiana/midori
-	cd midori
-	git archive --prefix=midori-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-source/midori-${_gitdate}.tar.bz2
-        popd
-}
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-#  cd ${srcdir}/${pkgname}-${_gitdate}
-  # python2 
-  export PYTHON=/usr/bin/python2
-  sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf
-  
-  ./configure --prefix=/usr --jobs=${MAKEFLAGS/-j/} \
-	--enable-addons \
-	--disable-hildon \
-	--enable-unique \
-	--enable-nls \
-	--enable-docs \
-	--enable-apidocs
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/midori/midori.install b/testing/midori/midori.install
deleted file mode 100644
index 8cee6c198..000000000
--- a/testing/midori/midori.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-
-gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-update-desktop-database -q
-gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
diff --git a/testing/miro/PKGBUILD b/testing/miro/PKGBUILD
deleted file mode 100644
index 026f4fabf..000000000
--- a/testing/miro/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 119004 2011-04-10 11:32:39Z eric $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=miro
-pkgver=3.5.1
-pkgrel=2
-pkgdesc="The free and open source internet TV platform"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.getmiro.com"
-license=('GPL2')
-depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
-         'python-pysqlite' 'pywebkitgtk' 'shared-mime-info'
-         'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
-         'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar'
-	 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl')
-makedepends=('pkg-config')
-install=miro.install
-source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('0f5c2a307e7040c9c2895ee9a2d1c3ff99d34e9e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/linux"
-
-  python2 setup.py install --root="${pkgdir}"
-
-  # fix miro startup script so --debug works with python2
-  sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
-  sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
-}
diff --git a/testing/miro/miro.install b/testing/miro/miro.install
deleted file mode 100644
index a5ee228aa..000000000
--- a/testing/miro/miro.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  xdg-icon-resource forceupdate --theme hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-  xdg-icon-resource forceupdate --theme hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-
diff --git a/testing/mousetweaks/PKGBUILD b/testing/mousetweaks/PKGBUILD
deleted file mode 100644
index 0d71b3962..000000000
--- a/testing/mousetweaks/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 2392 2008-06-01 19:38:25Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=mousetweaks
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
-arch=(i686 x86_64 'mips64el')
-license=('GPL3' 'FDL')
-depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas')
-makedepends=('gnome-doc-utils' 'intltool')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=mousetweaks.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('780c6349aa331635d15abc1f119d4f35de1534f1250e1921ec5f05efa098d242')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mousetweaks/mousetweaks.install b/testing/mousetweaks/mousetweaks.install
deleted file mode 100644
index 1ae919322..000000000
--- a/testing/mousetweaks/mousetweaks.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall mousetweaks
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/mpd/PKGBUILD b/testing/mpd/PKGBUILD
deleted file mode 100644
index 5d5972060..000000000
--- a/testing/mpd/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 119766 2011-04-14 20:23:04Z schiv $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=mpd
-pkgver=0.16.2
-pkgrel=3
-pkgdesc="Music daemon that plays MP3, FLAC, and Ogg Vorbis files"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://mpd.wikia.com/wiki/Server"
-depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
-         'sqlite3' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
-         'libpulse')
-makedepends=('pkgconfig' 'doxygen')
-install=${pkgname}.install
-source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
-        'mpd')
-md5sums=('dedb75cef8e489f3de5231031876fb77'
-         'e5669c2bff4031928531e52475addeb1')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-lastfm \
-    --enable-jack \
-    --enable-pulse \
-    --enable-documentation \
-    --disable-libwrap \
-    --disable-cue \
-    --disable-sidplay 
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # set ours dirs in mpd.conf file
-  sed -i 's|^music_directory.*$|#music_directory "path_to_your_music_collection"|1' doc/mpdconf.example
-  sed -i 's|playlist_directory.*$|playlist_directory "/var/lib/mpd/playlists"|1' doc/mpdconf.example
-  sed -i 's|db_file.*$|db_file "/var/lib/mpd/mpd.db"|1' doc/mpdconf.example
-  sed -i 's|log_file.*$|log_file "/var/log/mpd/mpd.log"|1' doc/mpdconf.example
-  sed -i 's|error_file.*$|error_file "/var/log/mpd/mpd.error"|1' doc/mpdconf.example
-  sed -i 's|#pid_file.*$|pid_file "/var/run/mpd/mpd.pid"|1' doc/mpdconf.example
-  sed -i 's|#state_file.*$|state_file "/var/lib/mpd/mpdstate"|1' doc/mpdconf.example
-  sed -i 's|#user.*$|user "mpd"|1' doc/mpdconf.example
-
-  install -Dm644 doc/mpdconf.example ${pkgdir}/usr/share/mpd/mpd.conf.example
-
-  install -Dm755 ${srcdir}/mpd ${pkgdir}/etc/rc.d/mpd
-  install -d ${pkgdir}/var/{lib/mpd/playlists,log/mpd}
-}
diff --git a/testing/mpd/mpd b/testing/mpd/mpd
deleted file mode 100755
index 6134e2ed4..000000000
--- a/testing/mpd/mpd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting Music Player Daemon"
-    [ ! -d /var/run/mpd ] && install -d -g 45 -o 45 /var/run/mpd
-    /usr/bin/mpd /etc/mpd.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Music Player Daemon"
-    /usr/bin/mpd --kill /etc/mpd.conf &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/mpd/mpd.install b/testing/mpd/mpd.install
deleted file mode 100644
index 885505a07..000000000
--- a/testing/mpd/mpd.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  post_upgrade
-  echo "==> Create a configuration file /etc/mpd.conf before using MPD (example: /usr/share/mpd/mpd.conf.example)"
-}
-
-post_upgrade() {
-  getent group "mpd" &>/dev/null || groupadd -r -g 45 mpd 1>/dev/null
-  getent passwd "mpd" &>/dev/null || useradd -r -u 45 -g mpd -d "/var/lib/mpd" -s "/bin/true" -G "audio" mpd 1>/dev/null
-  for dir in /var/{lib,log}/mpd; do
-    chown -R mpd:mpd "$dir" 1>/dev/null
-  done
-}
-
-post_remove() {
-  getent passwd "mpd" &>/dev/null && userdel mpd 1>/dev/null
-  getent group "mpd" &>/dev/null && groupdel mpd 1>/dev/null
-  [ -f etc/mpd.conf ] && mv etc/mpd.conf etc/mpd.conf.pacsave 1>/dev/null
-}
diff --git a/testing/mutter/PKGBUILD b/testing/mutter/PKGBUILD
deleted file mode 100644
index 623253bc1..000000000
--- a/testing/mutter/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 120688 2011-04-25 23:12:25Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
-
-pkgname=mutter
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="A window manager for GNOME3"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'clutter' 'gobject-introspection')
-makedepends=('intltool' 'gtk-doc')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=mutter.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6c3190789f935a2c982e78447726e87cf1d4b7af2f0b407cb6d6aca636e3d708')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/mutter \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain mutter ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/mutter/mutter.install b/testing/mutter/mutter.install
deleted file mode 100644
index 199f12584..000000000
--- a/testing/mutter/mutter.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=mutter
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/mx/PKGBUILD b/testing/mx/PKGBUILD
deleted file mode 100644
index 9d695d258..000000000
--- a/testing/mx/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 116756 2011-03-25 20:20:57Z ibiru $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Guenther Wutz <admin@wutzara.de>
-
-pkgname=mx
-pkgver=1.0.4
-pkgrel=1
-pkgdesc="A widget toolkit using Clutter"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.clutter-project.org"
-license=('LGPL')
-depends=('clutter' 'libxrandr' 'dbus-glib' 'gtk2' 'startup-notification')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-source=("http://source.clutter-project.org/sources/$pkgname/1.0/$pkgname-$pkgver.tar.bz2")
-sha256sums=('b0ed87865eff2280b0aad43d30ca68c829fd20f9fcc5ba961d16b9f8d1a784e2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/nautilus-open-terminal/PKGBUILD b/testing/nautilus-open-terminal/PKGBUILD
deleted file mode 100644
index 2e53a5bef..000000000
--- a/testing/nautilus-open-terminal/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 114750 2011-03-15 21:17:26Z ibiru $
-# Maintainer : Biru Ionut <ionut@archlinux.ro>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-pkgname=nautilus-open-terminal
-pkgver=0.19
-pkgrel=1
-pkgdesc="A nautilus plugin for opening terminals in arbitrary local paths"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://ftp.gnome.org/pub/GNOME/sources/nautilus-open-terminal"
-license=('GPL')
-depends=('nautilus')
-makedepends=('pkgconfig' 'gettext' 'intltool')
-install=nautilus-open-terminal.install
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool')
-sha256sums=('4760f3a5a862ba9239ea92690a42ecee2c68fad413b023dd06505bdb3ee1f6af')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -dm755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ${pkgname} "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -rf "${pkgdir}"/etc/gconf/schemas
-}
diff --git a/testing/nautilus-open-terminal/nautilus-open-terminal.install b/testing/nautilus-open-terminal/nautilus-open-terminal.install
deleted file mode 100644
index f7cdb9507..000000000
--- a/testing/nautilus-open-terminal/nautilus-open-terminal.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=nautilus-open-terminal
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/nautilus-sendto/PKGBUILD b/testing/nautilus-sendto/PKGBUILD
deleted file mode 100644
index f6a431c28..000000000
--- a/testing/nautilus-sendto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 117738 2011-04-04 17:38:24Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Eduardo Romero <eduardo@archlinux.org>
-# Contributor: Tor Krill <tor@krill.nu>
-
-pkgname=nautilus-sendto
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Nautilus context menu for sending files."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://download.gnome.org/sources/nautilus-sendto/"
-license=('GPL')
-groups=('gnome-extra')
-depends=('evolution-data-server' 'nautilus' 'dconf')
-makedepends=('pidgin' 'gajim' 'gettext' 'intltool')
-options=('!libtool' '!emptydirs')
-install=nautilus-sendto.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8821c6aab186ff3aa852438b4f2b64dce9f68e264908ce009e331bac74969e21')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/nautilus-sendto/nautilus-sendto.install b/testing/nautilus-sendto/nautilus-sendto.install
deleted file mode 100644
index e5204bcab..000000000
--- a/testing/nautilus-sendto/nautilus-sendto.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/nautilus/PKGBUILD b/testing/nautilus/PKGBUILD
deleted file mode 100644
index 3cef534ea..000000000
--- a/testing/nautilus/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 120629 2011-04-25 18:36:29Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=nautilus
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="The GNOME shell and file manager"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libexif' 'gnome-desktop' 'exempi' 'gtk3' 'hicolor-icon-theme' 'gvfs' 'desktop-file-utils' 'gsettings-desktop-schemas' 'shared-mime-info')
-makedepends=('intltool' 'gobject-introspection')
-replaces=('gnome-volume-manager')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f759d615c880caebf84290bc00c354488266bd7292479d88b8811a9c4f3106e8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/nautilus \
-      --disable-nst-extension \
-      --disable-update-mimedb \
-      --disable-packagekit \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/nautilus/nautilus.install b/testing/nautilus/nautilus.install
deleted file mode 100644
index 631e38649..000000000
--- a/testing/nautilus/nautilus.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall nautilus
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/network-manager-applet/PKGBUILD b/testing/network-manager-applet/PKGBUILD
deleted file mode 100644
index 50dafbad6..000000000
--- a/testing/network-manager-applet/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 118020 2011-04-05 06:52:04Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@archlinux.org>
-# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-# Contributor: Tor Krill <tor@krill.nu>
-# Contributor: Will Rea <sillywilly@gmail.com>
-
-pkgname=network-manager-applet
-pkgver=0.8.998
-pkgrel=1
-pkgdesc="GNOME frontends to NetWorkmanager"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3'
-         'notification-daemon' 'libnotify' 'gnome-icon-theme'
-         'mobile-broadband-provider-info' 'gconf')
-makedepends=('intltool' 'gnome-bluetooth')
-optdepends=('gnome-bluetooth: for PAN/DUN support')
-options=('!libtool')
-install=network-manager-applet.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('0a16e2ae00312062d4cd140d811227b84ac69e7d9487f6a84810f3d461894a82')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/networkmanager \
-      --disable-static \
-      --disable-maintainer-mode
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain nm-applet ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/network-manager-applet/network-manager-applet.install b/testing/network-manager-applet/network-manager-applet.install
deleted file mode 100644
index 9922d12b2..000000000
--- a/testing/network-manager-applet/network-manager-applet.install
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgname=network-manager-applet
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
diff --git a/testing/networkmanager-openvpn/PKGBUILD b/testing/networkmanager-openvpn/PKGBUILD
deleted file mode 100644
index 05bc1d322..000000000
--- a/testing/networkmanager-openvpn/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 118022 2011-04-05 06:52:18Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-openvpn
-pkgver=0.8.998
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for OpenVPN"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'openvpn')
-makedepends=('intltool' 'gtk3' 'gconf' 'libgnome-keyring')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-install=networkmanager-openvpn.install
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.8/NetworkManager-openvpn-${pkgver}.tar.bz2)
-sha256sums=('8c95cf23b5f6abc07f3b7383bb47a4be32d6232046b2a89d5259cc96e9c25d3c')
-
-build() {
-  cd "${srcdir}/NetworkManager-openvpn-${pkgver}"
-  ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/NetworkManager-openvpn-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/networkmanager-openvpn/networkmanager-openvpn.install b/testing/networkmanager-openvpn/networkmanager-openvpn.install
deleted file mode 100644
index 931c0517c..000000000
--- a/testing/networkmanager-openvpn/networkmanager-openvpn.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/networkmanager-pptp/PKGBUILD b/testing/networkmanager-pptp/PKGBUILD
deleted file mode 100644
index 579bfb7f6..000000000
--- a/testing/networkmanager-pptp/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 118030 2011-04-05 06:53:52Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-pptp
-pkgver=0.8.998
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for pptp "
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'pptpclient')
-makedepends=('intltool' 'gtk3' 'gconf' 'libgnome-keyring')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
-install=networkmanager-pptp.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.8/NetworkManager-pptp-${pkgver}.tar.bz2)
-sha256sums=('2cc2093dd2d81b0c4f82d44a8589f8c867c6b88ef0d8801631bd417f8480b9b9')
-
-build() {
-  cd "${srcdir}/NetworkManager-pptp-${pkgver}"
-  ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/NetworkManager-pptp-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/networkmanager-pptp/networkmanager-pptp.install b/testing/networkmanager-pptp/networkmanager-pptp.install
deleted file mode 100644
index 931c0517c..000000000
--- a/testing/networkmanager-pptp/networkmanager-pptp.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/networkmanager-vpnc/PKGBUILD b/testing/networkmanager-vpnc/PKGBUILD
deleted file mode 100644
index 9c2dbf41f..000000000
--- a/testing/networkmanager-vpnc/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 118033 2011-04-05 06:54:12Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-vpnc
-pkgver=0.8.998
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for vpnc"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme'
-         'gtk-update-icon-cache')
-makedepends=('intltool' 'gtk3' 'gconf' 'libgnome-keyring')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
-install=networkmanager-vpnc.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.8/NetworkManager-vpnc-${pkgver}.tar.bz2)
-sha256sums=('996ae3b504ad49433955baa6467f828fd161a7fbe16c7080fdcab7f7c5b92fc6')
-
-build() {
-  cd "${srcdir}/NetworkManager-vpnc-${pkgver}"
-  ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/NetworkManager-vpnc-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/networkmanager-vpnc/networkmanager-vpnc.install b/testing/networkmanager-vpnc/networkmanager-vpnc.install
deleted file mode 100644
index 931c0517c..000000000
--- a/testing/networkmanager-vpnc/networkmanager-vpnc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/networkmanager/NetworkManager.conf b/testing/networkmanager/NetworkManager.conf
deleted file mode 100644
index c37b59680..000000000
--- a/testing/networkmanager/NetworkManager.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile
diff --git a/testing/networkmanager/PKGBUILD b/testing/networkmanager/PKGBUILD
deleted file mode 100644
index dca1a2365..000000000
--- a/testing/networkmanager/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 119010 2011-04-10 13:15:03Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinxu.org>
-# Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-# Contributor: Tor Krill <tor@krill.nu>
-# Contributor: Will Rea <sillywilly@gmail.com>
-# Contributor: Valentine Sinitsyn <e_val@inbox.ru>
-
-pkgname=networkmanager
-pkgver=0.8.998
-pkgrel=2
-pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd')
-makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
-optdepends=('modemmanager: for modem management service'
-            'dhclient: alternative DHCP/DHCPv6 client'
-            'iptables: Connection sharing'
-            'dnsmasq: Connection sharing'
-            'bluez: Bluetooth support')
-options=('!libtool')
-backup=('etc/NetworkManager/NetworkManager.conf')
-install=networkmanager.install
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2
-        NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('239271e7cd93272776bb9297bfc5214ab910d3d9a7c1862b2625b90719014a82'
-            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
-            '1e4586991bc96ef004dc520c794047a336c54433e0bd4edc3879fb6e7ab0e553')
-
-build() {
-  cd "${srcdir}/NetworkManager-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/networkmanager \
-    --with-crypto=nss \
-    --with-distro=arch \
-    --with-dhclient=/usr/sbin/dhclient \
-    --with-dhcpcd=/sbin/dhcpcd \
-    --with-iptables=/usr/sbin/iptables \
-    --disable-static \
-    --enable-more-warnings=no \
-    --disable-wimax
-
-  make
-}
-
-package() {
-  cd "${srcdir}/NetworkManager-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/"
-
-  rm -rf "${pkgdir}/var/run/"
-}
diff --git a/testing/networkmanager/disable_set_hostname.patch b/testing/networkmanager/disable_set_hostname.patch
deleted file mode 100644
index 6c9e2f6c6..000000000
--- a/testing/networkmanager/disable_set_hostname.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.8.2.orig/src/nm-policy.c NetworkManager-0.8.2/src/nm-policy.c
---- NetworkManager-0.8.2.orig/src/nm-policy.c	2010-11-03 12:58:42.000000000 -0700
-+++ NetworkManager-0.8.2/src/nm-policy.c	2010-11-23 06:22:32.436707081 -0800
-@@ -342,6 +342,7 @@
- 		return;
- 	}
- 
-+#if 0
- 	/* Try automatically determined hostname from the best device's IP config */
- 	if (!best4)
- 		best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -396,6 +397,7 @@
- 		}
- 	}
- 
-+#endif
- 	/* If no automatically-configured hostname, try using the hostname from
- 	 * when NM started up.
- 	 */
diff --git a/testing/networkmanager/networkmanager.install b/testing/networkmanager/networkmanager.install
deleted file mode 100644
index de40c17ed..000000000
--- a/testing/networkmanager/networkmanager.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_upgrade() {
-  (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
-ATTENTION:
-  /etc/NetworkManager/nm-system-settings.conf has been replaced
-  by /etc/NetworkManager/NetworkManager.conf. Make sure you move
-  any custom settings to the new config file.
-MSG
-  true
-}
diff --git a/testing/nilfs-utils/PKGBUILD b/testing/nilfs-utils/PKGBUILD
deleted file mode 100644
index 1e4ff27e1..000000000
--- a/testing/nilfs-utils/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 120135 2011-04-20 11:43:51Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> 
-pkgname=nilfs-utils
-pkgver=2.0.22
-pkgrel=1
-pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
-arch=('i686' 'x86_64')
-url="http://www.nilfs.org/"
-license=('GPL2' 'LGPL2.1')
-backup=('etc/nilfs_cleanerd.conf')
-depends=('util-linux-ng')
-options=(!libtool)
-source=(http://www.nilfs.org/download/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d7650e53fbd4a73ef56e07a354fdd2b0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --libdir=/lib
-  make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install LDCONFIG=/bin/true
-}
diff --git a/testing/notification-daemon/PKGBUILD b/testing/notification-daemon/PKGBUILD
deleted file mode 100644
index 5a0c9ce41..000000000
--- a/testing/notification-daemon/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 110126 2011-02-16 17:22:45Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Mark Rosenstand <mark@borkware.net>
-
-pkgname=notification-daemon
-pkgver=0.7.1
-pkgrel=1
-pkgdesc="Notification daemon for the desktop notifications framework"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.galago-project.org/specs/notification/"
-depends=('gtk3' 'libcanberra')
-groups=('gnome')
-makedepends=('pkgconfig' 'intltool' 'dbus-glib')
-options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d26bf9021b3ae708d36e55437642a89d6b81693fe39d27c5d1ec869e22697b8b')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --libexecdir=/usr/lib/notification-daemon-1.0 \
-        --localstatedir=/var --disable-static
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR=${pkgdir} install
-}
diff --git a/testing/notification-daemon/notification-daemon.install b/testing/notification-daemon/notification-daemon.install
deleted file mode 100644
index 8a1aa3433..000000000
--- a/testing/notification-daemon/notification-daemon.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=notification-daemon
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/opal/PKGBUILD b/testing/opal/PKGBUILD
deleted file mode 100644
index 2b7321e6c..000000000
--- a/testing/opal/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 111695 2011-02-28 18:26:03Z heftig $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-pkgname=opal
-pkgver=3.8.3
-pkgrel=1
-pkgdesc="Open Phone Abstraction Library"
-arch=(i686 x86_64 'mips64el')
-url="http://www.ekiga.org"
-license=('GPL')
-depends=('ptlib' 'libtheora' 'x264' 'speex')
-makedepends=('ffmpeg')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d775626d786028357a8535fb2ff8f04bce9c1bff51db0e962f0939c2b988767f')
-
-build() {
-  cd "${srcdir}/opal-${pkgver}"
-  CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS" \
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/opal-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/pangomm/PKGBUILD b/testing/pangomm/PKGBUILD
deleted file mode 100644
index 6d9850748..000000000
--- a/testing/pangomm/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 116819 2011-03-25 21:50:27Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=pangomm
-pkgname=('pangomm' 'pangomm-docs')
-pkgver=2.28.1
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-makedepends=('pango' 'glibmm' 'glibmm-docs' 'cairomm' 'pkgconfig')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool')
-url="http://gtkmm.sourceforge.net/"
-sha256sums=('2c89b4460f88f8ece0e94a3332a804ca4858a3594abd84043b2898b61ab21c1b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-package_pangomm() {
-  pkgdesc="C++ bindings for pango"
-  depends=('pango' 'glibmm' 'cairomm')
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-  make DESTDIR="${pkgdir}" install
-}
-
-package_pangomm-docs() {
-  pkgdesc="Developer documentation for pangomm"
-  cd "${srcdir}/${pkgbase}-${pkgver}/docs"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/pidgin/PKGBUILD b/testing/pidgin/PKGBUILD
deleted file mode 100644
index 868e0937c..000000000
--- a/testing/pidgin/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 114320 2011-03-12 12:41:32Z ibiru $
-# Maintainer : 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>
-
-pkgbase=('pidgin')
-pkgname=('libpurple' 'pidgin' 'finch')
-pkgver=2.7.11
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pidgin.im/"
-license=('GPL')
-makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'python2' 'hicolor-icon-theme' 'silc-toolkit' 'gstreamer0.10'
-             'farsight2' 'avahi' 'tk' 'ca-certificates' 'intltool' 'networkmanager')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2)
-md5sums=('07c2a2535b4d7436b5ec7685fe063fec')
-
-build() {
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-    sed -i "s#env python#env python2#" */plugins/*.py
-    sed -i "s#env python#env python2#" 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 \
-		--with-python=/usr/bin/python2 \
-                --with-system-ssl-certs=/etc/ssl/certs
-    make
-}
-package_libpurple(){
-    pkgdesc="IM library extracted from Pidgin"
-    depends=('farsight2' 'libsasl' 'dbus-glib' 'silc-toolkit' 'nss' 'cyrus-sasl-plugins')
-    optdepends=('dbus-python: for purple-remote and purple-url-handler')
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-
-    for dir in libpurple share/sounds share/ca-certs m4macros po
-    do
-        make -C "${dir}" DESTDIR="${pkgdir}" install
-    done
-#    rm -rf "$pkgdir/etc" || return 1
-}
-
-package_pidgin(){
-    pkgdesc="Multi-protocol instant messaging client"
-    depends=("libpurple=$pkgver" 'startup-notification' 'gtkspell' 'libxss' 'hicolor-icon-theme' 'gstreamer0.10')
-    optdepends=('aspell: for spelling correction'
-                'avahi: Bonjour protocol support'
-                'ca-certificates: SSL CA certificates'
-                'gstreamer0.10-good-plugins: video and voice support'
-                'tk: Tcl/Tk scripting support')
-
-    install=pidgin.install
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-    #for linking
-    make -C libpurple DESTDIR="${pkgdir}" install-libLTLIBRARIES
-
-    make -C pidgin DESTDIR="${pkgdir}" install
-    make -C doc DESTDIR="${pkgdir}" install
-
-    #clean up libpurple
-    make -C libpurple DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES
-
-    install -D -m 0644 pidgin.desktop "${pkgdir}"/usr/share/applications/pidgin.desktop
-
-    rm -f "${pkgdir}"/usr/share/man/man1/finch.1
-}
-package_finch(){
-    pkgdesc="A ncurses-based messaging client"
-    depends=("libpurple=$pkgver" 'python2' 'gstreamer0.10')
-    optdepends=('avahi: Bonjour protocol support'
-                'ca-certificates: SSL CA certificates'
-                'tk: Tcl/Tk scripting support')
-
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-    #for linking
-    make -C libpurple DESTDIR="${pkgdir}" install-libLTLIBRARIES
-
-    make -C finch DESTDIR="${pkgdir}" install
-    make -C doc DESTDIR="${pkgdir}" install
-
-    #clean up libpurple
-    make -C libpurple DESTDIR="${pkgdir}" uninstall-libLTLIBRARIES
-    rm -f "${pkgdir}"/usr/share/man/man1/pidgin.1
-}
diff --git a/testing/pidgin/pidgin.install b/testing/pidgin/pidgin.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/testing/pidgin/pidgin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/pmount/PKGBUILD b/testing/pmount/PKGBUILD
deleted file mode 100644
index bbdb957e7..000000000
--- a/testing/pmount/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 119797 2011-04-15 09:29:18Z jgc $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=pmount
-pkgver=0.9.23
-pkgrel=2
-pkgdesc="mount removable devices as normal user"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://pmount.alioth.debian.org/"
-backup=('etc/pmount.allow')
-depends=('sysfsutils>=2.0.0-1' 'bash')
-makedepends=('intltool')
-source=(https://alioth.debian.org/frs/download.php/3310/pmount-0.9.23.tar.bz2)
-md5sums=('db19f5bf3151b1b41705ec7bafa439d3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-hal
-  make
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/polkit-gnome/PKGBUILD b/testing/polkit-gnome/PKGBUILD
deleted file mode 100644
index bb6bd296d..000000000
--- a/testing/polkit-gnome/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 117304 2011-03-30 19:38:26Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: onestep_ua <onestep@ukr.net>
-
-pkgname=polkit-gnome
-pkgver=0.101
-pkgrel=2
-pkgdesc="PolicyKit integration for the GNOME desktop"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.freedesktop.org/wiki/Software/PolicyKit"
-license=('LGPL')
-depends=('polkit>=0.101' 'gtk3')
-makedepends=('intltool' 'gobject-introspection')
-options=(!libtool)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2
-        polkit-gnome-authentication-agent-1.desktop)
-md5sums=('da6aaff473ed80f8958fd6f67a59defe'
-         '5668cffbfd031452c86db8adceba79b5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/polkit-gnome \
-      --disable-static --with-gtk=3.0
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 "${srcdir}/polkit-gnome-authentication-agent-1.desktop" \
-      "${pkgdir}/etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop"
-}
diff --git a/testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
deleted file mode 100644
index 2016294e9..000000000
--- a/testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
+++ /dev/null
@@ -1,88 +0,0 @@
-[Desktop Entry]
-Name=PolicyKit Authentication Agent
-Name[ar]=مدير الاستيثاق PolicyKit
-Name[be]=PolicyKit - аґент аўтэнтыфікацыі
-Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
-Name[ca]=Agent d'autenticació del PolicyKit
-Name[cs]=Ověřovací agent PolicyKit
-Name[da]=Godkendelsesprogrammet PolicyKit
-Name[de]=Legitimationsdienst von PolicyKit
-Name[el]=Πράκτορας πιστοποίησης PolicyKit
-Name[en_GB]=PolicyKit Authentication Agent
-Name[es]=Agente de autenticación de PolicyKit
-Name[eu]=PolicyKit autentifikatzeko agentea
-Name[fi]=PolicytKit-tunnistautumisohjelma
-Name[fr]=Agent d'authentification de PolicyKit
-Name[gl]=Axente de autenticación PolicyKit
-Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
-Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
-Name[hu]=PolicyKit hitelesítési ügynök
-Name[it]=Agente di autenticazione per PolicyKit
-Name[ja]=PolicyKit 認証エージェント
-Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
-Name[lt]=PolicyKit tapatybės nustatymo agentas
-Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
-Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट
-Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
-Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
-Name[pl]=Agent uwierzytelniania PolicyKit
-Name[pt]=Agente de Autenticação PolicyKit
-Name[pt_BR]=Agente de autenticação PolicyKit
-Name[ro]=Agent de autentificare PolicyKit
-Name[sk]=Agent PolicyKit na overovanie totožnosti
-Name[sl]=PolicyKit program overjanja
-Name[sv]=Autentiseringsagent för PolicyKit
-Name[ta]=PolicyKit அங்கீகார முகவர்
-Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
-Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
-Name[uk]=Агент автентифікації PolicyKit
-Name[zh_CN]=PolicyKit 认证代理
-Name[zh_HK]=PolicyKit 驗證代理程式
-Name[zh_TW]=PolicyKit 驗證代理程式
-Comment=PolicyKit Authentication Agent
-Comment[ar]=مدير الاستيثاق PolicyKit
-Comment[be]=PolicyKit - аґент аўтэнтыфікацыі
-Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
-Comment[ca]=Agent d'autenticació del PolicyKit
-Comment[cs]=Ověřovací agent PolicyKit
-Comment[da]=Godkendelsesprogrammet PolicyKit
-Comment[de]=Legitimationsdienst von PolicyKit
-Comment[el]=Πράκτορας πιστοποίησης PolicyKit
-Comment[en_GB]=PolicyKit Authentication Agent
-Comment[es]=Agente de autenticación de PolicyKit
-Comment[eu]=PolicyKit autentifikatzeko agentea
-Comment[fi]=PolicytKit-tunnistautumisohjelma
-Comment[fr]=Agent d'authentification de PolicyKit
-Comment[gl]=Axente de autenticación PolicyKit
-Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
-Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
-Comment[hu]=PolicyKit hitelesítési ügynök
-Comment[it]=Agente di autenticazione per PolicyKit
-Comment[ja]=PolicyKit 認証エージェント
-Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
-Comment[lt]=PolicyKit tapatybės nustatymo agentas
-Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
-Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट
-Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
-Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
-Comment[pl]=Agent uwierzytelniania PolicyKit
-Comment[pt]=Agente de Autenticação PolicyKit
-Comment[pt_BR]=Agente de autenticação PolicyKit
-Comment[ro]=Agent de autentificare PolicyKit
-Comment[sk]=Agent PolicyKit na overovanie totožnosti
-Comment[sl]=PolicyKit program overjanja
-Comment[sv]=Autentiseringsagent för PolicyKit
-Comment[ta]=PolicyKit அங்கீகார முகவர்
-Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
-Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
-Comment[uk]=Агент автентифікації PolicyKit
-Comment[zh_CN]=PolicyKit 认证代理
-Comment[zh_HK]=PolicyKit 驗證代理程式
-Comment[zh_TW]=PolicyKit 驗證代理程式
-Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-Terminal=false
-Type=Application
-Categories=
-NoDisplay=true
-NotShowIn=KDE;
-AutostartCondition=GNOME3 if-session gnome-fallback
diff --git a/testing/polkit/CVE-2011-1485.patch b/testing/polkit/CVE-2011-1485.patch
deleted file mode 100644
index f7054a63a..000000000
--- a/testing/polkit/CVE-2011-1485.patch
+++ /dev/null
@@ -1,908 +0,0 @@
-From dd848a42a64a3b22a0cc60f6657b56ce9b6010ae Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Thu, 31 Mar 2011 16:59:09 +0000
-Subject: PolkitUnixProcess: Clarify that the real uid is returned, not the effective one
-
-On Linux, also switch to parsing /proc/<pid>/status instead of relying
-on the st_uid returned by stat(2) to be the uid we want.
-
-This was pointed out by Neel Mehta <nmehta@google.com>. Thanks!
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
-index d95a1d4..876da69 100644
---- a/src/polkit/polkitunixprocess.c
-+++ b/src/polkit/polkitunixprocess.c
-@@ -24,9 +24,7 @@
- #endif
- 
- #include <sys/types.h>
--#ifndef HAVE_FREEBSD
--#include <sys/stat.h>
--#else
-+#ifdef HAVE_FREEBSD
- #include <sys/param.h>
- #include <sys/sysctl.h>
- #include <sys/user.h>
-@@ -34,6 +32,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
-+#include <stdio.h>
- 
- #include "polkitunixprocess.h"
- #include "polkitsubject.h"
-@@ -208,6 +207,8 @@ polkit_unix_process_get_pid (PolkitUnixProcess *process)
-  *
-  * Gets the uid of the owner of @process.
-  *
-+ * Note that this returns the real user-id (not the effective user-id) of @process.
-+ *
-  * Returns: The UNIX user id of the owner for @process or 0 if @error is set.
-  **/
- gint
-@@ -215,17 +216,21 @@ polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-                                GError            **error)
- {
-   gint result;
-+  gchar *contents;
-+  gchar **lines;
- #ifdef HAVE_FREEBSD
-   struct kinfo_proc p;
- #else
--  struct stat statbuf;
--  char procbuf[32];
-+  gchar filename[64];
-+  guint n;
- #endif
- 
-   g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
-   g_return_val_if_fail (error == NULL || *error == NULL, 0);
- 
-   result = 0;
-+  lines = NULL;
-+  contents = NULL;
- 
- #ifdef HAVE_FREEBSD
-   if (get_kinfo_proc (process->pid, &p) == 0)
-@@ -241,23 +246,52 @@ polkit_unix_process_get_owner (PolkitUnixProcess  *process,
- 
-   result = p.ki_uid;
- #else
--  g_snprintf (procbuf, sizeof procbuf, "/proc/%d", process->pid);
--  if (stat (procbuf, &statbuf) != 0)
-+
-+  /* see 'man proc' for layout of the status file
-+   *
-+   * Uid, Gid: Real, effective, saved set,  and  file  system  UIDs (GIDs).
-+   */
-+  g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid);
-+  if (!g_file_get_contents (filename,
-+                            &contents,
-+                            NULL,
-+                            error))
-     {
--      g_set_error (error,
--                   POLKIT_ERROR,
--                   POLKIT_ERROR_FAILED,
--                   "stat() failed for /proc/%d: %s",
--                   process->pid,
--                   g_strerror (errno));
-       goto out;
-     }
-+  lines = g_strsplit (contents, "\n", -1);
-+  for (n = 0; lines != NULL && lines[n] != NULL; n++)
-+    {
-+      gint real_uid, effective_uid;
-+      if (!g_str_has_prefix (lines[n], "Uid:"))
-+        continue;
-+      if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2)
-+        {
-+          g_set_error (error,
-+                       POLKIT_ERROR,
-+                       POLKIT_ERROR_FAILED,
-+                       "Unexpected line `%s' in file %s",
-+                       lines[n],
-+                       filename);
-+          goto out;
-+        }
-+      else
-+        {
-+          result = real_uid;
-+          goto out;
-+        }
-+    }
- 
--  result = statbuf.st_uid;
-+  g_set_error (error,
-+               POLKIT_ERROR,
-+               POLKIT_ERROR_FAILED,
-+               "Didn't find any line starting with `Uid:' in file %s",
-+               filename);
- #endif
- 
-- out:
--
-+out:
-+  g_strfreev (lines);
-+  g_free (contents);
-   return result;
- }
- 
---
-cgit v0.8.3-6-g21f6
-From 129b6223a19e7fb2753f8cad7957ac5402394076 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Fri, 01 Apr 2011 16:09:45 +0000
-Subject: Make PolkitUnixProcess also record the uid of the process
-
-This is needed to avoid possible TOCTTOU issues since a process can
-change both its real uid and effective uid.
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/docs/polkit/polkit-1-sections.txt b/docs/polkit/polkit-1-sections.txt
-index 12141e3..9f4fcf8 100644
---- a/docs/polkit/polkit-1-sections.txt
-+++ b/docs/polkit/polkit-1-sections.txt
-@@ -145,10 +145,13 @@ POLKIT_UNIX_SESSION_GET_CLASS
- PolkitUnixProcess
- polkit_unix_process_new
- polkit_unix_process_new_full
-+polkit_unix_process_new_for_owner
-+polkit_unix_process_set_pid
- polkit_unix_process_get_pid
-+polkit_unix_process_set_start_time
- polkit_unix_process_get_start_time
--polkit_unix_process_set_pid
--polkit_unix_process_get_owner
-+polkit_unix_process_set_uid
-+polkit_unix_process_get_uid
- <SUBSECTION Standard>
- PolkitUnixProcessClass
- POLKIT_UNIX_PROCESS
-diff --git a/src/polkit/polkitsubject.c b/src/polkit/polkitsubject.c
-index 577afec..d2c4c20 100644
---- a/src/polkit/polkitsubject.c
-+++ b/src/polkit/polkitsubject.c
-@@ -238,13 +238,18 @@ polkit_subject_from_string  (const gchar   *str,
-     {
-       gint scanned_pid;
-       guint64 scanned_starttime;
--      if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2)
-+      gint scanned_uid;
-+      if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT ":%d", &scanned_pid, &scanned_starttime, &scanned_uid) == 3)
-+        {
-+          subject = polkit_unix_process_new_for_owner (scanned_pid, scanned_starttime, scanned_uid);
-+        }
-+      else if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2)
-         {
-           subject = polkit_unix_process_new_full (scanned_pid, scanned_starttime);
-         }
-       else if (sscanf (str, "unix-process:%d", &scanned_pid) == 1)
-         {
--          subject = polkit_unix_process_new_full (scanned_pid, 0);
-+          subject = polkit_unix_process_new (scanned_pid);
-           if (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) == 0)
-             {
-               g_object_unref (subject);
-@@ -297,6 +302,8 @@ polkit_subject_to_gvariant (PolkitSubject *subject)
-                              g_variant_new_uint32 (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))));
-       g_variant_builder_add (&builder, "{sv}", "start-time",
-                              g_variant_new_uint64 (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject))));
-+      g_variant_builder_add (&builder, "{sv}", "uid",
-+                             g_variant_new_int32 (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject))));
-     }
-   else if (POLKIT_IS_UNIX_SESSION (subject))
-     {
-@@ -395,6 +402,7 @@ polkit_subject_new_for_gvariant (GVariant  *variant,
-       GVariant *v;
-       guint32 pid;
-       guint64 start_time;
-+      gint32 uid;
- 
-       v = lookup_asv (details_gvariant, "pid", G_VARIANT_TYPE_UINT32, error);
-       if (v == NULL)
-@@ -414,7 +422,18 @@ polkit_subject_new_for_gvariant (GVariant  *variant,
-       start_time = g_variant_get_uint64 (v);
-       g_variant_unref (v);
- 
--      ret = polkit_unix_process_new_full (pid, start_time);
-+      v = lookup_asv (details_gvariant, "uid", G_VARIANT_TYPE_INT32, error);
-+      if (v != NULL)
-+        {
-+          uid = g_variant_get_int32 (v);
-+          g_variant_unref (v);
-+        }
-+      else
-+        {
-+          uid = -1;
-+        }
-+
-+      ret = polkit_unix_process_new_for_owner (pid, start_time, uid);
-     }
-   else if (g_strcmp0 (kind, "unix-session") == 0)
-     {
-diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c
-index 876da69..913be3a 100644
---- a/src/polkit/polkitunixprocess.c
-+++ b/src/polkit/polkitunixprocess.c
-@@ -62,6 +62,7 @@ struct _PolkitUnixProcess
- 
-   gint pid;
-   guint64 start_time;
-+  gint uid;
- };
- 
- struct _PolkitUnixProcessClass
-@@ -74,6 +75,7 @@ enum
-   PROP_0,
-   PROP_PID,
-   PROP_START_TIME,
-+  PROP_UID
- };
- 
- static void subject_iface_init (PolkitSubjectIface *subject_iface);
-@@ -81,6 +83,9 @@ static void subject_iface_init (PolkitSubjectIface *subject_iface);
- static guint64 get_start_time_for_pid (gint    pid,
-                                        GError **error);
- 
-+static gint _polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-+                                            GError            **error);
-+
- #ifdef HAVE_FREEBSD
- static gboolean get_kinfo_proc (gint pid, struct kinfo_proc *p);
- #endif
-@@ -92,6 +97,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixProcess, polkit_unix_process, G_TYPE_OBJECT,
- static void
- polkit_unix_process_init (PolkitUnixProcess *unix_process)
- {
-+  unix_process->uid = -1;
- }
- 
- static void
-@@ -108,6 +114,10 @@ polkit_unix_process_get_property (GObject    *object,
-       g_value_set_int (value, unix_process->pid);
-       break;
- 
-+    case PROP_UID:
-+      g_value_set_int (value, unix_process->uid);
-+      break;
-+
-     case PROP_START_TIME:
-       g_value_set_uint64 (value, unix_process->start_time);
-       break;
-@@ -132,6 +142,14 @@ polkit_unix_process_set_property (GObject      *object,
-       polkit_unix_process_set_pid (unix_process, g_value_get_int (value));
-       break;
- 
-+    case PROP_UID:
-+      polkit_unix_process_set_uid (unix_process, g_value_get_int (value));
-+      break;
-+
-+    case PROP_START_TIME:
-+      polkit_unix_process_set_start_time (unix_process, g_value_get_uint64 (value));
-+      break;
-+
-     default:
-       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-       break;
-@@ -139,12 +157,39 @@ polkit_unix_process_set_property (GObject      *object,
- }
- 
- static void
-+polkit_unix_process_constructed (GObject *object)
-+{
-+  PolkitUnixProcess *process = POLKIT_UNIX_PROCESS (object);
-+
-+  /* sets start_time and uid in case they are unset */
-+
-+  if (process->start_time == 0)
-+    process->start_time = get_start_time_for_pid (process->pid, NULL);
-+
-+  if (process->uid == -1)
-+    {
-+      GError *error;
-+      error = NULL;
-+      process->uid = _polkit_unix_process_get_owner (process, &error);
-+      if (error != NULL)
-+        {
-+          process->uid = -1;
-+          g_error_free (error);
-+        }
-+    }
-+
-+  if (G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed != NULL)
-+    G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed (object);
-+}
-+
-+static void
- polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
- {
-   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- 
-   gobject_class->get_property = polkit_unix_process_get_property;
-   gobject_class->set_property = polkit_unix_process_set_property;
-+  gobject_class->constructed =  polkit_unix_process_constructed;
- 
-   /**
-    * PolkitUnixProcess:pid:
-@@ -156,7 +201,7 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
-                                    g_param_spec_int ("pid",
-                                                      "Process ID",
-                                                      "The UNIX process ID",
--                                                     -1,
-+                                                     0,
-                                                      G_MAXINT,
-                                                      0,
-                                                      G_PARAM_CONSTRUCT |
-@@ -166,6 +211,27 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
-                                                      G_PARAM_STATIC_NICK));
- 
-   /**
-+   * PolkitUnixProcess:uid:
-+   *
-+   * The UNIX user id of the process or -1 if unknown.
-+   *
-+   * Note that this is the real user-id, not the effective user-id.
-+   */
-+  g_object_class_install_property (gobject_class,
-+                                   PROP_UID,
-+                                   g_param_spec_int ("uid",
-+                                                     "User ID",
-+                                                     "The UNIX user ID",
-+                                                     -1,
-+                                                     G_MAXINT,
-+                                                     -1,
-+                                                     G_PARAM_CONSTRUCT |
-+                                                     G_PARAM_READWRITE |
-+                                                     G_PARAM_STATIC_NAME |
-+                                                     G_PARAM_STATIC_BLURB |
-+                                                     G_PARAM_STATIC_NICK));
-+
-+  /**
-    * PolkitUnixProcess:start-time:
-    *
-    * The start time of the process.
-@@ -178,7 +244,8 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
-                                                         0,
-                                                         G_MAXUINT64,
-                                                         0,
--                                                        G_PARAM_READABLE |
-+                                                        G_PARAM_CONSTRUCT |
-+                                                        G_PARAM_READWRITE |
-                                                         G_PARAM_STATIC_NAME |
-                                                         G_PARAM_STATIC_BLURB |
-                                                         G_PARAM_STATIC_NICK));
-@@ -186,113 +253,50 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass)
- }
- 
- /**
-- * polkit_unix_process_get_pid:
-+ * polkit_unix_process_get_uid:
-  * @process: A #PolkitUnixProcess.
-  *
-- * Gets the process id for @process.
-+ * Gets the user id for @process. Note that this is the real user-id,
-+ * not the effective user-id.
-  *
-- * Returns: The process id for @process.
-+ * Returns: The user id for @process or -1 if unknown.
-  */
- gint
--polkit_unix_process_get_pid (PolkitUnixProcess *process)
-+polkit_unix_process_get_uid (PolkitUnixProcess *process)
- {
--  g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
--  return process->pid;
-+  g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), -1);
-+  return process->uid;
- }
- 
- /**
-- * polkit_unix_process_get_owner:
-+ * polkit_unix_process_set_uid:
-  * @process: A #PolkitUnixProcess.
-- * @error: (allow-none): Return location for error or %NULL.
-+ * @uid: The user id to set for @process or -1 to unset it.
-  *
-- * Gets the uid of the owner of @process.
-+ * Sets the (real, not effective) user id for @process.
-+ */
-+void
-+polkit_unix_process_set_uid (PolkitUnixProcess *process,
-+                             gint               uid)
-+{
-+  g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
-+  g_return_if_fail (uid >= -1);
-+  process->uid = uid;
-+}
-+
-+/**
-+ * polkit_unix_process_get_pid:
-+ * @process: A #PolkitUnixProcess.
-  *
-- * Note that this returns the real user-id (not the effective user-id) of @process.
-+ * Gets the process id for @process.
-  *
-- * Returns: The UNIX user id of the owner for @process or 0 if @error is set.
-- **/
-+ * Returns: The process id for @process.
-+ */
- gint
--polkit_unix_process_get_owner (PolkitUnixProcess  *process,
--                               GError            **error)
-+polkit_unix_process_get_pid (PolkitUnixProcess *process)
- {
--  gint result;
--  gchar *contents;
--  gchar **lines;
--#ifdef HAVE_FREEBSD
--  struct kinfo_proc p;
--#else
--  gchar filename[64];
--  guint n;
--#endif
--
-   g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
--  g_return_val_if_fail (error == NULL || *error == NULL, 0);
--
--  result = 0;
--  lines = NULL;
--  contents = NULL;
--
--#ifdef HAVE_FREEBSD
--  if (get_kinfo_proc (process->pid, &p) == 0)
--    {
--      g_set_error (error,
--                   POLKIT_ERROR,
--                   POLKIT_ERROR_FAILED,
--                   "get_kinfo_proc() failed for pid %d: %s",
--                   process->pid,
--                   g_strerror (errno));
--      goto out;
--    }
--
--  result = p.ki_uid;
--#else
--
--  /* see 'man proc' for layout of the status file
--   *
--   * Uid, Gid: Real, effective, saved set,  and  file  system  UIDs (GIDs).
--   */
--  g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid);
--  if (!g_file_get_contents (filename,
--                            &contents,
--                            NULL,
--                            error))
--    {
--      goto out;
--    }
--  lines = g_strsplit (contents, "\n", -1);
--  for (n = 0; lines != NULL && lines[n] != NULL; n++)
--    {
--      gint real_uid, effective_uid;
--      if (!g_str_has_prefix (lines[n], "Uid:"))
--        continue;
--      if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2)
--        {
--          g_set_error (error,
--                       POLKIT_ERROR,
--                       POLKIT_ERROR_FAILED,
--                       "Unexpected line `%s' in file %s",
--                       lines[n],
--                       filename);
--          goto out;
--        }
--      else
--        {
--          result = real_uid;
--          goto out;
--        }
--    }
--
--  g_set_error (error,
--               POLKIT_ERROR,
--               POLKIT_ERROR_FAILED,
--               "Didn't find any line starting with `Uid:' in file %s",
--               filename);
--#endif
--
--out:
--  g_strfreev (lines);
--  g_free (contents);
--  return result;
-+  return process->pid;
- }
- 
- /**
-@@ -311,6 +315,21 @@ polkit_unix_process_get_start_time (PolkitUnixProcess *process)
- }
- 
- /**
-+ * polkit_unix_process_set_start_time:
-+ * @process: A #PolkitUnixProcess.
-+ * @start_time: The start time for @pid.
-+ *
-+ * Set the start time of @process.
-+ */
-+void
-+polkit_unix_process_set_start_time (PolkitUnixProcess *process,
-+                                    guint64            start_time)
-+{
-+  g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
-+  process->start_time = start_time;
-+}
-+
-+/**
-  * polkit_unix_process_set_pid:
-  * @process: A #PolkitUnixProcess.
-  * @pid: A process id.
-@@ -323,18 +342,17 @@ polkit_unix_process_set_pid (PolkitUnixProcess *process,
- {
-   g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process));
-   process->pid = pid;
--  if (pid != (gint) -1)
--    process->start_time = get_start_time_for_pid (pid, NULL);
- }
- 
- /**
-  * polkit_unix_process_new:
-  * @pid: The process id.
-  *
-- * Creates a new #PolkitUnixProcess for @pid. The start time of the
-- * process will be looked up in using e.g. the
-- * <filename>/proc</filename> filesystem depending on the platform in
-- * use.
-+ * Creates a new #PolkitUnixProcess for @pid.
-+ *
-+ * The uid and start time of the process will be looked up in using
-+ * e.g. the <filename>/proc</filename> filesystem depending on the
-+ * platform in use.
-  *
-  * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref().
-  */
-@@ -353,22 +371,42 @@ polkit_unix_process_new (gint pid)
-  *
-  * Creates a new #PolkitUnixProcess object for @pid and @start_time.
-  *
-+ * The uid of the process will be looked up in using e.g. the
-+ * <filename>/proc</filename> filesystem depending on the platform in
-+ * use.
-+ *
-  * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref().
-  */
- PolkitSubject *
- polkit_unix_process_new_full (gint pid,
-                               guint64 start_time)
- {
--  PolkitUnixProcess *process;
--
--  process = POLKIT_UNIX_PROCESS (polkit_unix_process_new ((gint) -1));
--  process->pid = pid;
--  if (start_time != 0)
--    process->start_time = start_time;
--  else
--    process->start_time = get_start_time_for_pid (pid, NULL);
-+  return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS,
-+                                       "pid", pid,
-+                                       "start_time", start_time,
-+                                       NULL));
-+}
- 
--  return POLKIT_SUBJECT (process);
-+/**
-+ * polkit_unix_process_new_for_owner:
-+ * @pid: The process id.
-+ * @start_time: The start time for @pid or 0 to look it up in e.g. <filename>/proc</filename>.
-+ * @uid: The (real, not effective) uid of the owner of @pid or -1 to look it up in e.g. <filename>/proc</filename>.
-+ *
-+ * Creates a new #PolkitUnixProcess object for @pid, @start_time and @uid.
-+ *
-+ * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref().
-+ */
-+PolkitSubject *
-+polkit_unix_process_new_for_owner (gint    pid,
-+                                   guint64 start_time,
-+                                   gint    uid)
-+{
-+  return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS,
-+                                       "pid", pid,
-+                                       "start_time", start_time,
-+                                       "uid", uid,
-+                                       NULL));
- }
- 
- static guint
-@@ -616,3 +654,95 @@ out:
- 
-   return start_time;
- }
-+
-+static gint
-+_polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-+                                GError            **error)
-+{
-+  gint result;
-+  gchar *contents;
-+  gchar **lines;
-+#ifdef HAVE_FREEBSD
-+  struct kinfo_proc p;
-+#else
-+  gchar filename[64];
-+  guint n;
-+#endif
-+
-+  g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0);
-+  g_return_val_if_fail (error == NULL || *error == NULL, 0);
-+
-+  result = 0;
-+  lines = NULL;
-+  contents = NULL;
-+
-+#ifdef HAVE_FREEBSD
-+  if (get_kinfo_proc (process->pid, &p) == 0)
-+    {
-+      g_set_error (error,
-+                   POLKIT_ERROR,
-+                   POLKIT_ERROR_FAILED,
-+                   "get_kinfo_proc() failed for pid %d: %s",
-+                   process->pid,
-+                   g_strerror (errno));
-+      goto out;
-+    }
-+
-+  result = p.ki_uid;
-+#else
-+
-+  /* see 'man proc' for layout of the status file
-+   *
-+   * Uid, Gid: Real, effective, saved set,  and  file  system  UIDs (GIDs).
-+   */
-+  g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid);
-+  if (!g_file_get_contents (filename,
-+                            &contents,
-+                            NULL,
-+                            error))
-+    {
-+      goto out;
-+    }
-+  lines = g_strsplit (contents, "\n", -1);
-+  for (n = 0; lines != NULL && lines[n] != NULL; n++)
-+    {
-+      gint real_uid, effective_uid;
-+      if (!g_str_has_prefix (lines[n], "Uid:"))
-+        continue;
-+      if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2)
-+        {
-+          g_set_error (error,
-+                       POLKIT_ERROR,
-+                       POLKIT_ERROR_FAILED,
-+                       "Unexpected line `%s' in file %s",
-+                       lines[n],
-+                       filename);
-+          goto out;
-+        }
-+      else
-+        {
-+          result = real_uid;
-+          goto out;
-+        }
-+    }
-+
-+  g_set_error (error,
-+               POLKIT_ERROR,
-+               POLKIT_ERROR_FAILED,
-+               "Didn't find any line starting with `Uid:' in file %s",
-+               filename);
-+#endif
-+
-+out:
-+  g_strfreev (lines);
-+  g_free (contents);
-+  return result;
-+}
-+
-+/* deprecated public method */
-+gint
-+polkit_unix_process_get_owner (PolkitUnixProcess  *process,
-+                               GError            **error)
-+{
-+  return _polkit_unix_process_get_owner (process, error);
-+}
-diff --git a/src/polkit/polkitunixprocess.h b/src/polkit/polkitunixprocess.h
-index b88cd03..531a57d 100644
---- a/src/polkit/polkitunixprocess.h
-+++ b/src/polkit/polkitunixprocess.h
-@@ -47,16 +47,24 @@ typedef struct _PolkitUnixProcess PolkitUnixProcess;
- typedef struct _PolkitUnixProcessClass PolkitUnixProcessClass;
- 
- GType           polkit_unix_process_get_type       (void) G_GNUC_CONST;
--PolkitSubject  *polkit_unix_process_new            (gint pid);
--PolkitSubject  *polkit_unix_process_new_full       (gint pid,
--                                                    guint64 start_time);
--
-+PolkitSubject  *polkit_unix_process_new            (gint               pid);
-+PolkitSubject  *polkit_unix_process_new_full       (gint               pid,
-+                                                    guint64            start_time);
-+PolkitSubject  *polkit_unix_process_new_for_owner  (gint               pid,
-+                                                    guint64            start_time,
-+                                                    gint               uid);
- gint            polkit_unix_process_get_pid        (PolkitUnixProcess *process);
- guint64         polkit_unix_process_get_start_time (PolkitUnixProcess *process);
-+gint            polkit_unix_process_get_uid        (PolkitUnixProcess *process);
- void            polkit_unix_process_set_pid        (PolkitUnixProcess *process,
-                                                     gint               pid);
-+void            polkit_unix_process_set_uid        (PolkitUnixProcess *process,
-+                                                    gint               uid);
-+void            polkit_unix_process_set_start_time (PolkitUnixProcess *process,
-+                                                    guint64            start_time);
-+
- gint            polkit_unix_process_get_owner      (PolkitUnixProcess  *process,
--                                                    GError            **error);
-+                                                    GError            **error) G_GNUC_DEPRECATED_FOR (polkit_unix_process_get_uid);
- 
- G_END_DECLS
- 
---
-cgit v0.8.3-6-g21f6
-From c23d74447c7615dc74dae259f0fc3688ec988867 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Fri, 01 Apr 2011 16:12:27 +0000
-Subject: Use polkit_unix_process_get_uid() to get the owner of a process
-
-This avoids a TOCTTOU problem.
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c
-index 495f752..9c331b6 100644
---- a/src/polkitbackend/polkitbackendsessionmonitor.c
-+++ b/src/polkitbackend/polkitbackendsessionmonitor.c
-@@ -293,14 +293,15 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
- 
-   if (POLKIT_IS_UNIX_PROCESS (subject))
-     {
--      local_error = NULL;
--      uid = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject), &local_error);
--      if (local_error != NULL)
-+      uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject));
-+      if ((gint) uid == -1)
-         {
--          g_propagate_prefixed_error (error, local_error, "Error getting user for process: ");
-+          g_set_error (error,
-+                       POLKIT_ERROR,
-+                       POLKIT_ERROR_FAILED,
-+                       "Unix process subject does not have uid set");
-           goto out;
-         }
--
-       ret = polkit_unix_user_new (uid);
-     }
-   else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
---
-cgit v0.8.3-6-g21f6
-From 3b12cfac29dddd27f1f166a7574d8374cc1dccf2 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <davidz@redhat.com>
-Date: Fri, 01 Apr 2011 16:13:15 +0000
-Subject: pkexec: Avoid TOCTTOU problems with parent process
-
-In a nutshell, the parent process may change its uid (either real- or
-effective uid) after launching pkexec. It can do this by exec()'ing
-e.g. a setuid root program.
-
-To avoid this problem, just use the uid the parent process had when it
-executed pkexec. This happens to be the same uid of the pkexec process
-itself.
-
-Additionally, remove some dubious code that allowed pkexec to continue
-when the parent process died as there is no reason to support
-something like that. Also ensure that the pkexec process is killed if
-the parent process dies.
-
-This problem was pointed out by Neel Mehta <nmehta@google.com>.
-
-Signed-off-by: David Zeuthen <davidz@redhat.com>
----
-diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
-index 9217954..3e656be 100644
---- a/src/programs/pkexec.c
-+++ b/src/programs/pkexec.c
-@@ -35,6 +35,10 @@
- #include <pwd.h>
- #include <errno.h>
- 
-+#ifdef __linux__
-+#include <sys/prctl.h>
-+#endif
-+
- #include <glib/gi18n.h>
- 
- #ifdef POLKIT_AUTHFW_PAM
-@@ -423,7 +427,6 @@ main (int argc, char *argv[])
-   GPtrArray *saved_env;
-   gchar *opt_user;
-   pid_t pid_of_caller;
--  uid_t uid_of_caller;
-   gpointer local_agent_handle;
- 
-   ret = 127;
-@@ -598,40 +601,49 @@ main (int argc, char *argv[])
-    */
-   g_type_init ();
- 
--  /* now check if the program that invoked us is authorized */
-+  /* make sure we are nuked if the parent process dies */
-+#ifdef __linux__
-+  if (prctl (PR_SET_PDEATHSIG, SIGTERM) != 0)
-+    {
-+      g_printerr ("prctl(PR_SET_PDEATHSIG, SIGTERM) failed: %s\n", g_strerror (errno));
-+      goto out;
-+    }
-+#else
-+#warning "Please add OS specific code to catch when the parent dies"
-+#endif
-+
-+  /* Figure out the parent process */
-   pid_of_caller = getppid ();
-   if (pid_of_caller == 1)
-     {
-       /* getppid() can return 1 if the parent died (meaning that we are reaped
--       * by /sbin/init); get process group leader instead - for example, this
--       * happens when launching via gnome-panel (alt+f2, then 'pkexec gedit').
-+       * by /sbin/init); In that case we simpy bail.
-        */
--      pid_of_caller = getpgrp ();
--    }
--
--  subject = polkit_unix_process_new (pid_of_caller);
--  if (subject == NULL)
--    {
--      g_printerr ("No such process for pid %d: %s\n", (gint) pid_of_caller, error->message);
--      g_error_free (error);
-+      g_printerr ("Refusing to render service to dead parents.\n");
-       goto out;
-     }
- 
--  /* paranoia: check that the uid of pid_of_caller matches getuid() */
--  error = NULL;
--  uid_of_caller = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject),
--                                                 &error);
--  if (error != NULL)
--    {
--      g_printerr ("Error determing pid of caller (pid %d): %s\n", (gint) pid_of_caller, error->message);
--      g_error_free (error);
--      goto out;
--    }
--  if (uid_of_caller != getuid ())
--    {
--      g_printerr ("User of caller (%d) does not match our uid (%d)\n", uid_of_caller, getuid ());
--      goto out;
--    }
-+  /* This process we want to check an authorization for is the process
-+   * that launched us - our parent process.
-+   *
-+   * At the time the parent process fork()'ed and exec()'ed us, the
-+   * process had the same real-uid that we have now. So we use this
-+   * real-uid instead of of looking it up to avoid TOCTTOU issues
-+   * (consider the parent process exec()'ing a setuid helper).
-+   *
-+   * On the other hand, the monotonic process start-time is guaranteed
-+   * to never change so it's safe to look that up given only the PID
-+   * since we are guaranteed to be nuked if the parent goes away
-+   * (cf. the prctl(2) call above).
-+   */
-+  subject = polkit_unix_process_new_for_owner (pid_of_caller,
-+                                               0, /* 0 means "look up start-time in /proc" */
-+                                               getuid ());
-+  /* really double-check the invariants guaranteed by the PolkitUnixProcess class */
-+  g_assert (subject != NULL);
-+  g_assert (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)) == pid_of_caller);
-+  g_assert (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)) >= 0);
-+  g_assert (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) > 0);
- 
-   error = NULL;
-   authority = polkit_authority_get_sync (NULL /* GCancellable* */, &error);
---
-cgit v0.8.3-6-g21f6
diff --git a/testing/polkit/PKGBUILD b/testing/polkit/PKGBUILD
deleted file mode 100644
index fadb173be..000000000
--- a/testing/polkit/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 120110 2011-04-20 09:34:59Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=polkit
-pkgver=0.101
-pkgrel=2
-pkgdesc="Application development toolkit for controlling system-wide privileges"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL')
-url="http://www.freedesktop.org/wiki/Software/PolicyKit"
-depends=('glib2' 'pam' 'expat')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
-replaces=('policykit')
-options=('!libtool')
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
-        CVE-2011-1485.patch
-        polkit.pam)
-md5sums=('f925ac93aba3c072977370c1e27feb7f'
-         '4d858b8ab602614d7db2bc8574f6fd29'
-         '6564f95878297b954f0572bc1610dd15')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/CVE-2011-1485.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
-      --disable-static --enable-gtk-doc
-  make
-  make DESTDIR="${pkgdir}" install
-
-  install -m644 "${srcdir}/polkit.pam" "${pkgdir}/etc/pam.d/polkit-1"
-}
diff --git a/testing/polkit/polkit.pam b/testing/polkit/polkit.pam
deleted file mode 100644
index 04f53e0db..000000000
--- a/testing/polkit/polkit.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-password        required        pam_unix.so
diff --git a/testing/ptlib/PKGBUILD b/testing/ptlib/PKGBUILD
deleted file mode 100644
index 863d7c4d2..000000000
--- a/testing/ptlib/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 111692 2011-02-28 18:24:37Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=ptlib
-pkgver=2.8.3
-pkgrel=1
-pkgdesc="Portable Windows Library"
-arch=(i686 x86_64 'mips64el')
-url="http://www.ekiga.org/"
-license=('GPL')
-depends=('gcc-libs' 'openssl' 'alsa-lib' 'sdl' 'expat' 'libpulse' 'v4l-utils')
-replaces=('pwlib')
-conflicts=('pwlib')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('076afde4e53e5fd0989adc344c3741aea8342b105c3e879e2f4f9a42ef36793e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib \
-      --sysconfdir=/etc --localstatedir=/var \
-      --enable-opal --enable-plugins \
-      --enable-oss --enable-v4l2 \
-      --disable-avc --enable-sdl \
-      --enable-ipv6 --enable-v4l \
-      --enable-dc --disable-odbc \
-      --enable-expat --enable-httpforms
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/pygobject/PKGBUILD b/testing/pygobject/PKGBUILD
deleted file mode 100644
index 243834e80..000000000
--- a/testing/pygobject/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 120090 2011-04-19 21:33:57Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=pygobject
-pkgname=(pygobject py3gobject pygobject-devel)
-pkgver=2.28.4
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-depends=('glib2' 'gobject-introspection')
-makedepends=(python python2 python-cairo python2-cairo)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
-options=('!libtool')
-url="http://www.pygtk.org/"
-sha256sums=('70e3a05dd5f688e68b5dafa2412cd4fdbc0af83792a5752ef6353c4accf2022c')
-
-build() {
-  cd "${srcdir}"
-  cp -a "${pkgbase}-${pkgver}" python2-build
-  mkdir devel
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr
-    make
-  )
-
-  (
-    cd "${pkgbase}-${pkgver}"
-    ./configure --prefix=/usr
-    make
-  )
-}
-
-package_pygobject() {
-  pkgdesc="Python 2 bindings for GObject"
-  depends+=('python2' 'python2-cairo' 'pygobject-devel')
-
-  cd "${srcdir}/python2-build"
-  make DESTDIR="${pkgdir}" install
-
-  find "$pkgdir"/usr/share/pygobject -name '*.py' | \
-    xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
-
-  # Split devel stuff
-  mv "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}} \
-    "$srcdir/devel/"
-}
-
-package_py3gobject() {
-  pkgdesc="Python 3 bindings for GObject"
-  depends+=('python' 'python-cairo' 'pygobject-devel')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # Delete devel stuff
-  rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}}
-}
-
-package_pygobject-devel() {
-  pkgdesc="Development files for the pygobject bindings"
-  depends=(python2)
-
-  cd "${srcdir}/devel"
-  mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject/2.0}
-
-  mv bin       "$pkgdir/usr/"
-  mv include   "$pkgdir/usr/"
-  mv pkgconfig "$pkgdir/usr/lib/"
-  mv gtk-doc   "$pkgdir/usr/share/"
-  mv codegen   "$pkgdir/usr/share/pygobject/2.0/"
-  mv xsl       "$pkgdir/usr/share/pygobject/"
-}
diff --git a/testing/pygtk/PKGBUILD b/testing/pygtk/PKGBUILD
deleted file mode 100644
index a099c4521..000000000
--- a/testing/pygtk/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 117387 2011-04-01 12:58:54Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=pygtk
-pkgver=2.24.0
-pkgrel=1
-pkgdesc="Python bindings for the GTK widget set"
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-depends=('libglade' 'python2-cairo' 'pygobject')
-makedepends=('python-numpy' 'pygobject-devel')
-optdepends=('python-numpy')
-options=('!libtool')
-url="http://www.pygtk.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
-        python27.patch)
-sha256sums=('cd1c1ea265bd63ff669e92a2d3c2a88eb26bcd9e5363e0f82c896e649f206912'
-            '39a30456cba055a452bb55c74ef1ff2f5f7bfaad22855b4dd569ab009b56b682')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=623965
-  patch -Np1 -i "${srcdir}/python27.patch"
-
-  PYTHON=python2 ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m644 gtk/gtk-extrafuncs.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
-
-  sed -i -e 's#env python$#env python2#' "${pkgdir}"/usr/lib/pygtk/2.0/{,demos/}*.py
-}
diff --git a/testing/pygtk/python27.patch b/testing/pygtk/python27.patch
deleted file mode 100644
index 9bbe2b5ae..000000000
--- a/testing/pygtk/python27.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/gtk/gtkmodule.c b/gtk/gtkmodule.c
-index c0e1493..aa8cf10 100644
---- a/gtk/gtkmodule.c
-+++ b/gtk/gtkmodule.c
-@@ -227,8 +227,12 @@ init_gtk(void)
-     pygtk_add_stock_items(d);
-     
-     /* extension API */
--    PyDict_SetItemString(d, "_PyGtk_API",
--			 o=PyCObject_FromVoidPtr(&functions, NULL));
-+#if PY_VERSION_HEX >= 0x02070000
-+    o = PyCapsule_New(&functions, "gtk._gtk._PyGtk_API", NULL);
-+#else
-+    o = PyCObject_FromVoidPtr(&functions, NULL);
-+#endif
-+    PyDict_SetItemString(d, "_PyGtk_API", o);
-     Py_DECREF(o);
- 	
-     PyGtkDeprecationWarning = PyErr_NewException("gtk.GtkDeprecationWarning",
-diff --git a/gtk/pygtk.h b/gtk/pygtk.h
-index 573c3b9..e4c680f 100644
---- a/gtk/pygtk.h
-+++ b/gtk/pygtk.h
-@@ -60,6 +60,18 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
- 
- 
- /* a function to initialise the pygtk functions */
-+
-+/* Python 2.7 introduced the PyCapsule API and deprecated the CObject API */
-+#if PY_VERSION_HEX >= 0x02070000
-+#define init_pygtk() G_STMT_START { \
-+    void *capsule = PyCapsule_Import("gtk._gtk._PyGtk_API", 0); \
-+    if (!capsule) { \
-+        return; \
-+    } \
-+    _PyGtk_API = (struct _PyGtk_FunctionStruct*)capsule; \
-+} G_STMT_END
-+#else /* PY_VERSION_HEX */
-+/* Python 2.6 and earlier use the CObject API */
- #define init_pygtk() G_STMT_START { \
-     PyObject *pygtk = PyImport_ImportModule("gtk"); \
-     if (pygtk != NULL) { \
-@@ -79,6 +91,7 @@ struct _PyGtk_FunctionStruct *_PyGtk_API;
-         return; \
-     } \
- } G_STMT_END
-+#endif /* PY_VERSION_HEX */
- 
- #endif
- 
diff --git a/testing/pywebkitgtk/PKGBUILD b/testing/pywebkitgtk/PKGBUILD
deleted file mode 100644
index 6acf5f0b5..000000000
--- a/testing/pywebkitgtk/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: kasa <biuta.jr@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=pywebkitgtk
-pkgver=1.1.7
-pkgrel=5
-pkgdesc="Python bindings to the WebKit GTK+ port"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/pywebkitgtk/"
-license=('LGPL')
-depends=('libwebkit' 'pygtk')
-options=('!libtool' '!makeflags')
-source=(http://pywebkitgtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4dbe0111c0b0ad2280052e4534903a9b')
-
-build() {
-        cd ${srcdir}/${pkgname}-${pkgver}
-
-        ./configure --prefix=/usr
-        make
-}
-
-package() {
-        cd ${srcdir}/${pkgname}-${pkgver}
-
-        make DESTDIR=${pkgdir} install
-}
diff --git a/testing/raptor/PKGBUILD b/testing/raptor/PKGBUILD
deleted file mode 100644
index c41f00a3f..000000000
--- a/testing/raptor/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 115794 2011-03-21 16:03:23Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: eric <eric@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=raptor
-pkgver=2.0.2
-pkgrel=1
-pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://librdf.org/raptor"
-depends=('libxml2>=2.7.8' 'curl>=7.21.2' 'zlib>=1.2.5' 'libxslt>=1.1.26')
-license=('LGPL')
-options=('!libtool')
-source=(http://librdf.org/dist/source/raptor2-$pkgver.tar.gz)
-md5sums=('b0f874c200c4b3214b5bf4806ae82353')
-
-build() {
-  cd ${srcdir}/raptor2-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/raptor2-${pkgver}
-  make prefix=${pkgdir}/usr install
-}
diff --git a/testing/raptor1/PKGBUILD b/testing/raptor1/PKGBUILD
deleted file mode 100644
index c8cf6aa7b..000000000
--- a/testing/raptor1/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 110599 2011-02-20 15:52:07Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: eric <eric@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=raptor1
-pkgver=1.4.21
-pkgrel=3
-pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples - old V1 api for compatibility"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://librdf.org/raptor"
-depends=('libxml2' 'curl' 'zlib' 'libxslt')
-license=('LGPL')
-options=('!libtool' '!docs')
-source=(http://librdf.org/dist/source/raptor-$pkgver.tar.gz)
-md5sums=('992061488af7a9e2d933df6b694bb876')
-
-build() {
-  cd ${srcdir}/raptor-${pkgver}
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/raptor-${pkgver}
-  make prefix=${pkgdir}/usr install
-  
-  mv ${pkgdir}/usr/bin/rapper ${pkgdir}/usr/bin/rapperV1
-  rm -f ${pkgdir}/usr/share/man/man1/rapper.1
-}
diff --git a/testing/rasqal-compat/PKGBUILD b/testing/rasqal-compat/PKGBUILD
deleted file mode 100644
index df8ab86fe..000000000
--- a/testing/rasqal-compat/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 120512 2011-04-24 17:16:36Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Lawrence Lee <valheru@facticius.net>
-
-pkgbase=rasqal-compat
-pkgname=('rasqal-compat' 'rasqal-compat-devel')
-_pkgname=rasqal
-pkgver=0.9.21
-pkgrel=2
-url="http://librdf.org/rasqal"
-license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
-options=('!libtool')
-makedepends=('raptor1>=1.4.21' 'mpfr')
-source=(http://download.librdf.org/source/${_pkgname}-${pkgver}.tar.gz)
-md5sums=('55b67ec92a059ef8979d46486b00a032')
-
-build() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--disable-static \
-	--enable-release
-  make
-}
-
-package_rasqal-compat() {
-
- pkgdesc="a free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings; compatibility version providing an older API"
- depends=('raptor1>=1.4.21' 'mpfr')
- 
-  cd ${srcdir}/${_pkgname}-${pkgver}
-  make -C src DESTDIR=${pkgdir} install
-  rm ${pkgdir}/usr/lib/librasqal.so
-  rm -rf ${pkgdir}/usr/{bin,include,share}
-}
-
-package_rasqal-compat-devel() {
-
- pkgdesc="a free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings; compatibility version providing an older API - devel files"
- depends=('rasqal-compat')
-
-  cd ${srcdir}/${_pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  rm ${pkgdir}/usr/lib/librasqal.so.*
-  rm -rf ${pkgdir}/usr/share
-}
diff --git a/testing/rasqal/PKGBUILD b/testing/rasqal/PKGBUILD
deleted file mode 100644
index 5ada50032..000000000
--- a/testing/rasqal/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 120960 2011-04-27 19:27:24Z andrea $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Lawrence Lee <valheru@facticius.net>
-
-pkgname=rasqal
-epoch=1
-pkgver=0.9.21
-pkgrel=1
-pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings"
-url="http://librdf.org/rasqal"
-license=('GPL' 'LGPL')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('raptor1' 'mpfr')
-options=('!libtool')
-replaces=('rasqal-compat')
-conflicts=('rasqal-compat')
-source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz)
-md5sums=('55b67ec92a059ef8979d46486b00a032')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--disable-static \
-	--enable-release
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/redland-compat/PKGBUILD b/testing/redland-compat/PKGBUILD
deleted file mode 100644
index 571b3d6d6..000000000
--- a/testing/redland-compat/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 120522 2011-04-24 17:36:18Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Francois Charette <francois.archlinux.org> 
-
-pkgbase=redland-compat
-pkgname=('redland-compat' 'redland-compat-devel')
-pkgver=1.0.12
-pkgrel=3
-url="http://librdf.org/"
-license=("GPL")
-arch=('i686' 'x86_64')
-makedepends=('rasqal-compat-devel>=0.9.21-2' 'raptor1>=1.4.21' 'libtool' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
-options=('!libtool' '!emptydirs')
-source=(http://download.librdf.org/source/"${pkgbase/-compat/}"-$pkgver.tar.gz
-	    rpath.diff)
-md5sums=('40f37a5ad97fdfbf984f78dcea0c6115'
-         'acc85e784f01a656bd56777f95880787')
-
-build() {
-  cd ${srcdir}/"${pkgname/-compat/}"-${pkgver}
-  ./configure --prefix=/usr \
-	--enable-release \
-	--disable-static \
-	--with-sqlite=3 \
-	--disable-modular
-
-  # nuke rpath
-  patch -Np0 -i ${srcdir}/rpath.diff
-
-  make
-}
-
-package_redland-compat() {
-
- pkgdesc="Library that provides a high-level interface to RDF  data; compatibility version providing an older API"
- depends=('rasqal-compat>=0.9.21' 'raptor1>=1.4.21' 'libtool' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
- replaces=('redland-compat-storage-mysql' 'redland-compat-storage-postgresql' 'redland-compat-storage-virtuoso' 'redland-compat-storage-sqlite')
-
-  cd ${srcdir}/"${pkgbase/-compat/}"-${pkgver}
-  make -C src DESTDIR=${pkgdir} install
-  rm ${pkgdir}/usr/lib/librdf.so
-  rm -rf ${pkgdir}/usr/{include,share}
-}
-
-package_redland-compat-devel() {
-
- pkgdesc="Library that provides a high-level interface to RDF  data; compatibility version providing an older API - devel files"
- depends=('redland-compat')
- 
-  cd ${srcdir}/"${pkgbase/-compat/}"-${pkgver}
-  #make -C src DESTDIR=${pkgdir} install
-  make DESTDIR=${pkgdir} install
-  rm ${pkgdir}/usr/lib/librdf.so.*
-  rm -rf ${pkgdir}/usr/share
-}
diff --git a/testing/redland-compat/rpath.diff b/testing/redland-compat/rpath.diff
deleted file mode 100644
index 831bc80ed..000000000
--- a/testing/redland-compat/rpath.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtool	2011-02-20 10:46:47.000000000 +0100
-+++ libtool.new	2011-02-20 10:52:58.285764909 +0100
-@@ -324,7 +324,7 @@
- 
- # Flag to hardcode $libdir into a binary during linking.
- # This must work even if $libdir does not exist
--hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
-+hardcode_libdir_flag_spec=" "
- 
- # If ld is used when linking, flag to hardcode $libdir into a binary
- # during linking.  This must work even if $libdir does not exist.
diff --git a/testing/redland/PKGBUILD b/testing/redland/PKGBUILD
deleted file mode 100644
index 02ae91e1b..000000000
--- a/testing/redland/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 120965 2011-04-27 19:29:40Z andrea $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Francois Charette <francois.archlinux.org> 
-
-pkgbase=redland
-epoch=1
-pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
-pkgver=1.0.12
-pkgrel=1
-url="http://librdf.org/"
-license=("GPL")
-arch=('i686' 'x86_64' 'mips64el')
-makedepends=('rasqal>=0.9.21' 'raptor1' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
-options=('!libtool')
-source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz
-        rpath.diff)
-md5sums=('40f37a5ad97fdfbf984f78dcea0c6115'
-         'acc85e784f01a656bd56777f95880787')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-	--enable-release \
-	--disable-static \
-	--with-raptor=system \
-	--with-rasqal=system \
-	--with-sqlite=3
-
-  # nuke rpath
-  patch -Np0 -i ${srcdir}/rpath.diff
-
-  make
-}
-
-package_redland() {
- pkgdesc="Library that provides a high-level interface to RDF data"
- depends=('rasqal>=0.9.21' 'raptor1' 'libtool')
- replaces=('redland-compat' 'redland-compat-devel')
- conflicts=('redland-compat' 'redland-compat-devel')
- 
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/lib/redland
-}
-
-package_redland-storage-mysql() {
- pkgdesc="MySQL storage support for Redland"
- depends=('redland' 'libmysqlclient')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  install -dm755 ${pkgdir}/usr/lib/redland
-  install -m755 src/.libs/librdf_storage_mysql.so ${pkgdir}/usr/lib/redland/librdf_storage_mysql.so 
-}
-
-package_redland-storage-postgresql() {
- pkgdesc="PostgreSQL storage support for Redland"
- depends=('redland' 'postgresql-libs')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  install -dm755 ${pkgdir}/usr/lib/redland
-  install -m755 src/.libs/librdf_storage_postgresql.so ${pkgdir}/usr/lib/redland/
-}
-
-package_redland-storage-virtuoso() {
- pkgdesc="Virtuoso storage support for Redland"
- depends=('redland' 'unixodbc' 'db')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  install -dm755 ${pkgdir}/usr/lib/redland
-  install -m755 src/.libs/librdf_storage_virtuoso.so ${pkgdir}/usr/lib/redland/
-}
-
-package_redland-storage-sqlite() {
- pkgdesc="SQLite storage support for Redland"
- depends=('redland' 'sqlite3' 'db')
- 
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  install -dm755 ${pkgdir}/usr/lib/redland
-  install -m755 src/.libs/librdf_storage_sqlite.so ${pkgdir}/usr/lib/redland/
-}
diff --git a/testing/redland/rpath.diff b/testing/redland/rpath.diff
deleted file mode 100644
index 831bc80ed..000000000
--- a/testing/redland/rpath.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtool	2011-02-20 10:46:47.000000000 +0100
-+++ libtool.new	2011-02-20 10:52:58.285764909 +0100
-@@ -324,7 +324,7 @@
- 
- # Flag to hardcode $libdir into a binary during linking.
- # This must work even if $libdir does not exist
--hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
-+hardcode_libdir_flag_spec=" "
- 
- # If ld is used when linking, flag to hardcode $libdir into a binary
- # during linking.  This must work even if $libdir does not exist.
diff --git a/testing/rest/PKGBUILD b/testing/rest/PKGBUILD
deleted file mode 100644
index 721a90b53..000000000
--- a/testing/rest/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 120404 2011-04-23 20:50:45Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-pkgname=rest
-pkgver=0.7.10
-pkgrel=1
-pkgdesc="rest"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libxml2' 'libsoup-gnome')
-makedepends=('gobject-introspection' 'gtk-doc')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2)
-sha256sums=('2908f974ae6cc71af1152d419209f307bcce8ca2dfe0b4b55b3fad8ba4a646a5')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/rhythmbox/PKGBUILD b/testing/rhythmbox/PKGBUILD
deleted file mode 100644
index 0fa87b4af..000000000
--- a/testing/rhythmbox/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 120732 2011-04-26 08:35:51Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=rhythmbox
-pkgver=2.90.1
-pkgrel=3
-pkgdesc="An iTunes-like music player/libary"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.rhythmbox.org"
-depends=('libgpod' 'gvfs-afc' 'libgnome-media-profiles' 'totem-plparser' 'libsoup-gnome' 'gtk3' 'libmusicbrainz3' 'libmtp' 'libnotify'
-         'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'pygobject' 'gstreamer0.10-python' 'python-gnomekeyring' 'gstreamer0.10-base-plugins'
-         'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python-mako')
-makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection')
-optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
-            'gstreamer0.10-bad-plugins: Extra media codecs'
-            'gstreamer0.10-ffmpeg: Extra media codecs'
-            'brasero: cd burning')
-options=('!libtool' '!emptydirs' '!strip')
-install=rhythmbox.install
-#source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.archlinux.org/others/${pkgname}/${pkgname}-${pkgver}-20110426.tar.xz)
-sha256sums=('513cfa653cf68a05b1fe5f6e41744af4baed0d0fff169000b3153effa232e23d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export CFLAGS="$CFLAGS -g -O1"
-  export CXXFLAGS="$CXXFLAGS -g -O1"
-  PYTHON=/usr/bin/python2 ./autogen.sh
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/rhythmbox \
-      --localstatedir=/var --disable-static \
-      --enable-daap --enable-python \
-      --with-mdns=avahi --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/rhythmbox/rhythmbox.install b/testing/rhythmbox/rhythmbox.install
deleted file mode 100644
index cbea0e6b3..000000000
--- a/testing/rhythmbox/rhythmbox.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=rhythmbox
-
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-     if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-         usr/sbin/gconfpkg --uninstall ${pkgname}
-     fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/seahorse/PKGBUILD b/testing/seahorse/PKGBUILD
deleted file mode 100644
index c235a694d..000000000
--- a/testing/seahorse/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 120604 2011-04-25 18:04:11Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Michel Brabants <michel.linux@tiscali.be>
-
-pkgname=seahorse
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="GNOME application for managing PGP keys."
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-url="http://projects.gnome.org/seahorse/"
-depends=('gtk3' 'gconf' 'libgnome-keyring' 'gnome-keyring' 'libnotify' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('gettext' 'libldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm')
-options=('!libtool' '!emptydirs')
-groups=('gnome-extra')
-install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('79efc22f9fe7db3d53a02be8bcf910be25aef0e321a49ec87a3a709f8aaaa912')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-ldap --enable-hkp \
-      --disable-scrollkeeper \
-      --disable-update-mime-database
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain seahorse ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/seahorse/seahorse.install b/testing/seahorse/seahorse.install
deleted file mode 100644
index 97feac3b1..000000000
--- a/testing/seahorse/seahorse.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=seahorse
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/seed/PKGBUILD b/testing/seed/PKGBUILD
deleted file mode 100644
index daa22e565..000000000
--- a/testing/seed/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 120380 2011-04-23 09:20:16Z ibiru $
-#Maintainer : Ionut Biru <ibiru@archlinux.org>
-#Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=seed
-pkgver=3.0.0
-pkgrel=1
-pkgdesc="Library and interpreter for JavaScript with GObject type system bindings."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Seed/"
-license=('LGPL')
-options=('!libtool')
-depends=('mpfr' 'libwebkit3' 'gnome-js-common' 'gobject-introspection')
-makedepends=('intltool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c7ef8e0c7cfe633c6bf9bfc13ab56458f053dfb12b784c75cc50dfa7cf828be6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/slv2/PKGBUILD b/testing/slv2/PKGBUILD
deleted file mode 100644
index 4b01c3dae..000000000
--- a/testing/slv2/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 120979 2011-04-27 19:40:32Z andrea $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Leslie P. Polzer <polzer@stardawn.org>
-
-pkgname=slv2
-pkgver=0.6.6
-pkgrel=4
-pkgdesc="Library for LV2 hosts"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://drobilla.net/software/slv2"
-license=('GPL')
-depends=('redland>=1.0.12' 'lv2core' 'jack')
-makedepends=('python2')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2)
-md5sums=('b8e8e0e82dd04324fcd533e8acd1ce85')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  python2 waf configure --prefix=/usr
-  python2 waf build $MAKEFLAGS
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  python2 waf install --destdir="$pkgdir/"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/slv2/slv2.changelog b/testing/slv2/slv2.changelog
deleted file mode 100644
index f394a5067..000000000
--- a/testing/slv2/slv2.changelog
+++ /dev/null
@@ -1,23 +0,0 @@
-22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 0.6.6-3:
-	raptor rebuild
-
-24 Nov 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* PKGBUILD :
-	Get rid of sed and use python2 directly for waf.
-	waf fix for python transition already included previously (unlogged).
-	Release only (no need binary update; no runtime python requirement).
-
-9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 0.6.6-2 :
-	Brought into extra from community for ardour
-		- adds "LV2" plug-ins support
-
-	* PKGBUILD :
-	Minor cosmetic ammendments.
-
-	* slv2.changelog :
-	Added this changelog.
diff --git a/testing/slv2/slv2.install b/testing/slv2/slv2.install
deleted file mode 100644
index c980ddfab..000000000
--- a/testing/slv2/slv2.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  echo "Updating Shared Library Links"
-  /sbin/ldconfig
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/soprano/PKGBUILD b/testing/soprano/PKGBUILD
deleted file mode 100644
index 01ab62317..000000000
--- a/testing/soprano/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 120970 2011-04-27 19:34:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=soprano
-pkgver=2.6.0
-pkgrel=4
-pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://soprano.sourceforge.net/'
-license=('GPL' 'LGPL')
-depends=('qt' 'clucene' 'redland-storage-virtuoso' 'libiodbc')
-makedepends=('cmake' 'openjdk6' 'doxygen')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('03ae49e87c6ec99e57d0433c2650846f')
-
-build() {
-  cd ${srcdir}
-  mkdir build
-  cd build
-  . /etc/profile.d/openjdk6.sh
-  # we need the rpath
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/sound-juicer/PKGBUILD b/testing/sound-juicer/PKGBUILD
deleted file mode 100644
index 491a676b8..000000000
--- a/testing/sound-juicer/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 118432 2011-04-06 20:04:46Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributer: Ben <contrasutra@myrealbox.com>
-
-pkgname=sound-juicer
-pkgver=2.32.1
-pkgrel=1
-pkgdesc="A cd ripper application"
-arch=(i686 x86_64 'mips64el')
-license=('GPL')
-depends=('libmusicbrainz3' 'libgnome-media-profiles' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'brasero' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils>=0.20.0' 'pkgconfig' 'gnome-common' 'gtk-doc')
-options=(!emptydirs)
-#source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-groups=('gnome-extra')
-install=sound-juicer.install
-url="http://www.burtonini.com/blog/computers/sound-juicer"
-sha256sums=('09fd7ebaa24b20a98be82bc10a9733f2e8d45bb31fb95a12535672d85272d8c2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain sound-juicer ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/sound-juicer/sound-juicer.install b/testing/sound-juicer/sound-juicer.install
deleted file mode 100644
index 5286a0055..000000000
--- a/testing/sound-juicer/sound-juicer.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=sound-juicer
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/telepathy-farsight/PKGBUILD b/testing/telepathy-farsight/PKGBUILD
deleted file mode 100644
index c324c9e43..000000000
--- a/testing/telepathy-farsight/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 120813 2011-04-26 16:12:15Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Ju Liu <liuju86 at gmail dot com>
-# Contributor: Denis Zawada <deno@rootnode.net>
-pkgname=telepathy-farsight
-pkgver=0.0.17
-pkgrel=1
-pkgdesc="A telepathy-backend to use stream engine."
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-license=('GPL')
-depends=('telepathy-glib' 'farsight2' 'gstreamer0.10-base')
-makedepends=('libxslt' 'python2')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f98377802d38333924f6f1a955a2d42a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-      --libexecdir=/usr/lib/telepathy \
-      --enable-static=no
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/telepathy-gabble/PKGBUILD b/testing/telepathy-gabble/PKGBUILD
deleted file mode 100644
index 47e5961f1..000000000
--- a/testing/telepathy-gabble/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 120355 2011-04-22 18:03:17Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Daniel Balieiro <daniel@balieiro.com>
-# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
-pkgname=telepathy-gabble
-pkgver=0.12.0
-pkgrel=2
-pkgdesc="A Jabber/XMPP connection manager for Telepathy"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://telepathy.freedesktop.org"
-groups=('telepathy')
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libsoup' 'libnice' 'util-linux' 'sqlite3')
-makedepends=('libxslt' 'python2')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz)
-install=telepathy-gabble.install
-md5sums=('89e47b131911a969cc2a2ccefa1fc015')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-  	--libexecdir=/usr/lib/telepathy --with-tls=openssl
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/telepathy-gabble/telepathy-gabble.install b/testing/telepathy-gabble/telepathy-gabble.install
deleted file mode 100644
index 87d7838b8..000000000
--- a/testing/telepathy-gabble/telepathy-gabble.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/telepathy-glib/PKGBUILD b/testing/telepathy-glib/PKGBUILD
deleted file mode 100644
index cbb00a4c0..000000000
--- a/testing/telepathy-glib/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 120253 2011-04-21 18:20:55Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-pkgname=telepathy-glib
-pkgver=0.14.5
-pkgrel=1
-pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://telepathy.freedesktop.org"
-groups=('telepathy')
-license=('LGPL2.1')
-options=('!libtool' '!emptydirs')
-depends=('dbus-glib')
-makedepends=('libxslt' 'vala' 'gobject-introspection')
-source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('2911d33b45744cdc41774c91f6b837c2')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-        --libexecdir=/usr/lib/telepathy \
-        --enable-vala-bindings \
-        --enable-static=no
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR=${pkgdir} install
-}
diff --git a/testing/telepathy-idle/PKGBUILD b/testing/telepathy-idle/PKGBUILD
deleted file mode 100644
index 2a177d64d..000000000
--- a/testing/telepathy-idle/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 120807 2011-04-26 15:59:24Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-# Contributor: Samuel Mendes <heka.lok@gmail.com>
-pkgname=telepathy-idle
-pkgver=0.1.9
-pkgrel=1
-pkgdesc="An IRC connection manager for Telepathy"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-groups=('telepathy')
-license=('LGPL')
-depends=('telepathy-glib' 'openssl')
-makedepends=('libxslt' 'python2')
-install=telepathy-idle.install
-source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        python27.patch)
-md5sums=('423f2cc0481bdb32facb850eaf586ff2'
-         '03661efde8f768417e224720e1346d7b')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    patch -Np1 -i "${srcdir}/python27.patch"
-    autoreconf -fi
-    ./configure --prefix=/usr \
-    	--libexecdir=/usr/lib/telepathy
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/telepathy-idle/python27.patch b/testing/telepathy-idle/python27.patch
deleted file mode 100644
index f8abffb57..000000000
--- a/testing/telepathy-idle/python27.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur telepathy-idle-0.1.7.orig/configure.ac telepathy-idle-0.1.7/configure.ac
---- telepathy-idle-0.1.7.orig/configure.ac	2010-12-07 03:52:29.000000000 -0800
-+++ telepathy-idle-0.1.7/configure.ac	2010-12-07 09:41:21.179715253 -0800
-@@ -103,7 +103,7 @@
-   AC_MSG_ERROR([xsltproc (from the libxslt source package) is required])
- fi
- PYTHON=
--AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python])
-+AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python2.7 python])
- if test -z "$PYTHON"; then
-   AC_MSG_ERROR([Python is required to compile this package])
- fi
-@@ -111,7 +111,7 @@
- 
- dnl check for a version of python that can run the twisted tests
- AC_MSG_CHECKING([for Python with Twisted and IRC protocol support])
--for TEST_PYTHON in python2.5 python2.6 python; do
-+for TEST_PYTHON in python2.5 python2.6 python2.7 python; do
-   if $TEST_PYTHON -c "from sys import version_info; import dbus, dbus.mainloop.glib; raise SystemExit(version_info < (2, 5, 0, 'final', 0))" >/dev/null 2>&1; then
-     if $TEST_PYTHON -c "import twisted.words.protocols.irc, twisted.internet.reactor" >/dev/null 2>&1; then
-       AM_CONDITIONAL([WANT_TWISTED_TESTS], true)
diff --git a/testing/telepathy-idle/telepathy-idle.install b/testing/telepathy-idle/telepathy-idle.install
deleted file mode 100644
index 87d7838b8..000000000
--- a/testing/telepathy-idle/telepathy-idle.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/telepathy-logger/PKGBUILD b/testing/telepathy-logger/PKGBUILD
deleted file mode 100644
index caa9dabe8..000000000
--- a/testing/telepathy-logger/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 117598 2011-04-04 12:33:45Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=telepathy-logger
-pkgver=0.2.8
-pkgrel=1
-pkgdesc="Telepathy framework logging daemon"
-arch=(i686 x86_64 'mips64el')
-url="http://telepathy.freedesktop.org/wiki/Logger"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'sqlite3' 'libxml2' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('755e6dcaa6a9ccf47f2fe73f3d4d888b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/telepathy \
-    --disable-static \
-    --disable-scrollkeeper \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/telepathy-logger/telepathy-logger.install b/testing/telepathy-logger/telepathy-logger.install
deleted file mode 100644
index 8fd591f55..000000000
--- a/testing/telepathy-logger/telepathy-logger.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove(){
-    post_install
-}
diff --git a/testing/telepathy-mission-control/PKGBUILD b/testing/telepathy-mission-control/PKGBUILD
deleted file mode 100644
index 2f910c3ed..000000000
--- a/testing/telepathy-mission-control/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 120802 2011-04-26 15:50:07Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Ju Liu <liuju86 at gmail dot com>
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-# Contributor: Andreas Zwinkau <beza1e1@web.de>
-pkgname=telepathy-mission-control
-pkgver=5.7.9
-pkgrel=1
-pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers."
-arch=('i686' 'x86_64' 'mips64el')
-url="http://mission-control.sourceforge.net/"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libgnome-keyring')
-makedepends=('libxslt' 'python2')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz)
-md5sums=('df7e63d857676fab9ec2261cffe5eb4a')
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    ./configure --prefix=/usr \
-    	--libexecdir=/usr/lib/telepathy \
-	--enable-gnome-keyring
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/telepathy-qt4/PKGBUILD b/testing/telepathy-qt4/PKGBUILD
deleted file mode 100644
index 6d3b6e5d1..000000000
--- a/testing/telepathy-qt4/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 120824 2011-04-26 16:25:58Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=telepathy-qt4
-pkgver=0.5.15
-pkgrel=1
-pkgdesc="A library for Qt-based Telepathy clients."
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-license=('LGPL')
-options=('!libtool')
-depends=('qt' 'telepathy-farsight')
-makedepends=('libxslt' 'python2' 'cmake')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('2066d447a46ca3d767ff82ca562244a0')
-
-build() {
-    cd "${srcdir}"
-
-    mkdir build
-    cd build
-    cmake ../${pkgname}-${pkgver} \
-        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_INSTALL_PREFIX=/usr
-    make
-}
-
-package() {
-    cd "${srcdir}"/build
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/telepathy-sofiasip/PKGBUILD b/testing/telepathy-sofiasip/PKGBUILD
deleted file mode 100644
index 7704eac95..000000000
--- a/testing/telepathy-sofiasip/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 120816 2011-04-26 16:16:06Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Timm Preetz <timm@preetz.us>
-pkgname=telepathy-sofiasip
-pkgver=0.7.1
-pkgrel=1
-pkgdesc="a SIP-protocol connection manager for the Telepathy framework based on SofiaSIP-stack."
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-license=('LGPL')
-depends=('telepathy-glib' 'sofia-sip')
-makedepends=('libxslt' 'python2')
-install=telepathy-sofiasip.install
-groups=('telepathy')
-source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4139027790aae97d8a18260e09a747c6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/telepathy-sofiasip/telepathy-sofiasip.install b/testing/telepathy-sofiasip/telepathy-sofiasip.install
deleted file mode 100644
index 87d7838b8..000000000
--- a/testing/telepathy-sofiasip/telepathy-sofiasip.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/tomboy/PKGBUILD b/testing/tomboy/PKGBUILD
deleted file mode 100644
index ae5b3290f..000000000
--- a/testing/tomboy/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 120780 2011-04-26 15:03:27Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=tomboy
-pkgver=1.6.1
-pkgrel=1
-pkgdesc="Desktop note-taking application for Linux and Unix"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.gnome.org/projects/tomboy/"
-depends=('gtk2' 'gtkspell' 'ndesk-dbus-glib' 'mono-addins' 'gnome-sharp')
-makedepends=('intltool' 'pkgconfig'  'gnome-doc-utils')
-options=('!libtool' '!emptydirs' '!makeflags')
-groups=('gnome-extra')
-install=tomboy.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.6/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4c0b5e0103682711e1cd620c9c617716a33b3520d62c22a2f6ab7bab2a54e61c')
-
-build() {
-  export MONO_SHARED_DIR="${srcdir}/.wabi"
-  mkdir -p "${MONO_SHARED_DIR}"
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper \
-      --disable-update-mimedb
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain tomboy ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/tomboy/tomboy.install b/testing/tomboy/tomboy.install
deleted file mode 100644
index f8e2e4a07..000000000
--- a/testing/tomboy/tomboy.install
+++ /dev/null
@@ -1,25 +0,0 @@
-pkgname=tomboy
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime
-}
diff --git a/testing/totem-plparser/PKGBUILD b/testing/totem-plparser/PKGBUILD
deleted file mode 100644
index 4c0943fa1..000000000
--- a/testing/totem-plparser/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 116067 2011-03-22 18:11:16Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=totem-plparser
-pkgver=2.32.4
-pkgrel=1
-url="http://www.hadess.net/totem.php3"
-pkgdesc="Totem playlist parser library"
-license=('LGPL')
-arch=(i686 x86_64 'mips64el')
-depends=('gmime' 'libsoup-gnome')
-makedepends=('intltool' 'pkgconfig' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/2.32/totem-pl-parser-${pkgver}.tar.bz2)
-sha256sums=('349006c8c26a7bee6775c2f48cb158be15c92608f444598c67ca820c205213d6')
-
-build() {
-  cd "${srcdir}/totem-pl-parser-${pkgver}"
-  ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-static
-  make
-}
-
-package(){
-  cd "${srcdir}/totem-pl-parser-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/totem/PKGBUILD b/testing/totem/PKGBUILD
deleted file mode 100644
index ff9fb8a51..000000000
--- a/testing/totem/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 120757 2011-04-26 11:04:01Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=totem
-pkgname=('totem' 'totem-plugin')
-pkgver=3.0.1
-pkgrel=1
-url="http://www.hadess.net/totem.php3"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2' 'custom')
-makedepends=('intltool' 'gnome-doc-utils' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser'
-    'libpeas' 'pygobject' 'pygobject-devel' 'nautilus' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'libgdata'
-    'xulrunner' 'lirc-utils' 'libepc' 'bluez' 'vala')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('013b6cfedac6ff264aa27de7346597d0b8da7f4ed1f91b2c966a13d3fdff679a')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/totem \
-      --localstatedir=/var --disable-static \
-      --enable-python --enable-nautilus \
-      --with-dbus --disable-scrollkeeper
-  make
-}
-
-package_totem() {
-  pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
-  depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas')
-  groups=('gnome-extra')
-  install=totem.install
-  optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
-              'gstreamer0.10-bad-plugins: Extra media codecs'
-              'gstreamer0.10-ffmpeg: Extra media codecs'
-              'lirc-utils: Infrared Remote Control plugin'
-              'libepc: Publish Playlist plugin'
-              'libgdata: YouTube Browser plugin'
-              'bluez: Bemused plugin')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/lib/mozilla"
-  rm -f "${pkgdir}/usr/lib/totem/totem-plugin-viewer"
-
-  sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \
-    $pkgdir/usr/lib/totem/{totem/totem-bugreport.py,plugins/iplayer/iplayer2.py}
-
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem/COPYING"
-}
-
-package_totem-plugin() {
-  pkgdesc="Totem mozilla/firefox plugin"
-  depends=("totem=${pkgver}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C browser-plugin \
-    plugindir=/usr/lib/mozilla/plugins \
-    xptdir=/usr/lib/mozilla/plugins \
-    DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/share"
-
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem-plugin/COPYING"
-}
diff --git a/testing/totem/totem.install b/testing/totem/totem.install
deleted file mode 100644
index 07cb42dcb..000000000
--- a/testing/totem/totem.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.91.91) < 0 )); then
-    usr/sbin/gconfpkg --uninstall totem
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/udisks/01-mkfs-tempdir.patch b/testing/udisks/01-mkfs-tempdir.patch
deleted file mode 100644
index 976108264..000000000
--- a/testing/udisks/01-mkfs-tempdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# Description: Daemon does not create /var/run/udisks/, so mkfs jobs fail.
-# Just create the directory in /tmp, this is what /tmp is for, after all.
-# Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=24265
-
-Index: udisks/src/helpers/job-mkfs.c
-===================================================================
---- udisks.orig/src/helpers/job-mkfs.c	2010-12-05 23:08:54.587881164 +0100
-+++ udisks/src/helpers/job-mkfs.c	2010-12-05 23:09:12.399889312 +0100
-@@ -546,7 +546,7 @@
-   /* take ownership of the device if requested */
-   if (take_ownership_uid != 0 || take_ownership_gid != 0)
-     {
--      char dir[256] = PACKAGE_LOCALSTATE_DIR "/run/udisks/job-mkfs-XXXXXX";
-+      char dir[256] = "/tmp/job-mkfs-XXXXXX";
- 
-       if (mkdtemp (dir) == NULL)
-         {
diff --git a/testing/udisks/PKGBUILD b/testing/udisks/PKGBUILD
deleted file mode 100644
index 300232975..000000000
--- a/testing/udisks/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 119537 2011-04-11 22:26:25Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=udisks
-pkgver=1.0.3
-pkgrel=1
-pkgdesc="Disk Management Service"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.freedesktop.org/wiki/Software/udisks"
-license=('GPL')
-depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'lvm2' 'eject')
-makedepends=('intltool' 'docbook-xsl' 'gtk-doc')
-options=(!libtool)
-#source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
-        01-mkfs-tempdir.patch)
-sha256sums=('a4d18b2de59c1567df5342f26960c6c3e70a0320f7bafe42893f2708c9b57dd5'
-            '786c0adb1a37e16b351c906527e3cbd17193bb51d8c1dd0889f216556c419c6c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/01-mkfs-tempdir.patch"
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/udisks --disable-static
-  #fix location for bash_completion helper
-  sed -i -e 's|profile.d|bash_completion.d|' tools/Makefile
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/var/run"
-}
diff --git a/testing/upower/PKGBUILD b/testing/upower/PKGBUILD
deleted file mode 100644
index 8c9201da2..000000000
--- a/testing/upower/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 116154 2011-03-22 19:35:44Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=upower
-pkgver=0.9.9
-pkgrel=1
-pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://upower.freedesktop.org"
-license=('GPL')
-depends=('udev' 'libusb' 'polkit' 'pm-utils' 'dbus-glib')
-makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection')
-replaces=('devicekit-power')
-options=('!libtool')
-source=($url/releases/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('39e19bab2c776000477d6d0ddb4bc508808954f63867a2da2be40eaf341214e2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/upower --disable-static
-  make
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/vinagre/PKGBUILD b/testing/vinagre/PKGBUILD
deleted file mode 100644
index 1801cb940..000000000
--- a/testing/vinagre/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 120639 2011-04-25 18:49:25Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Allan McRae <mcrae_allan@hotmail.com>
-# Contributor: lp76 <l.peduto@gmail.com>
-
-pkgname=vinagre
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="A VNC Client for the GNOME Desktop"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.gnome.org/projects/vinagre/"
-install=vinagre.install
-depends=('libgnome-keyring' 'gtk-vnc' 'avahi' 'desktop-file-utils' 'hicolor-icon-theme' 'telepathy-glib' 'dconf' 'libpeas' 'shared-mime-info' 'gnome-icon-theme')
-optdepends=('rdesktop: RDP plugin')
-makedepends=('gtk-doc' 'intltool' 'rdesktop')
-groups=('gnome-extra')
-options=('!emptydirs' '!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a4c2ec5935c0cea0da1958e7f27a925a03867854cdcaf904ce8c7e405ebe2e5b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # Disable Spice until someone cares (file a bug!)
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \
-      --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/vinagre/vinagre.install b/testing/vinagre/vinagre.install
deleted file mode 100644
index 68158ac80..000000000
--- a/testing/vinagre/vinagre.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.91.91-2) < 0 )); then
-    usr/sbin/gconfpkg --uninstall vinagre
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/vino/PKGBUILD b/testing/vino/PKGBUILD
deleted file mode 100644
index cfbed0f8e..000000000
--- a/testing/vino/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 120634 2011-04-25 18:44:11Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=vino
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="a VNC server for the GNOME desktop"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils')
-makedepends=('intltool' 'networkmanager')
-groups=('gnome-extra')
-url="http://www.gnome.org"
-options=(!emptydirs)
-install=vino.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d2111f1f8dbcb78005cce3d28ea42b5deabe5ced83eb11030e4a74874fdfdfca')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vino \
-      --localstatedir=/var \
-      --enable-gnome-keyring \
-      --enable-avahi
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/vino/vino.install b/testing/vino/vino.install
deleted file mode 100644
index 469266843..000000000
--- a/testing/vino/vino.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall vino
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/vte/PKGBUILD b/testing/vte/PKGBUILD
deleted file mode 100644
index 90e371e2b..000000000
--- a/testing/vte/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 117622 2011-04-04 13:08:29Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=vte
-pkgname=(vte vte3 vte-common)
-pkgver=0.28.0
-pkgrel=1
-pkgdesc="Virtual Terminal Emulator widget for use with"
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-makedepends=('pygtk' 'intltool' 'gobject-introspection' 'gtk2' 'gtk3' 'pygobject-devel' 'gtk-doc')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-${pkgver}.tar.bz2)
-sha256sums=('1467c566aa9e55c1e33aa1dfea3f14dd4c8a4a63ff0005b254bd8c2c375d952e')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  #warning: type-punning to incomplete type might break strict-aliasing rules
-  export CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-  mkdir build-gtk2
-  pushd build-gtk2
-  PYTHON=python2 ../configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vte \
-      --localstatedir=/var --disable-static \
-      --enable-introspection --with-gtk=2.0 \
-      --enable-gtk-doc
-  make
-  popd
-
-  mkdir build-gtk3
-  pushd build-gtk3
-  PYTHON=python2 ../configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vte \
-      --localstatedir=/var --disable-static \
-      --enable-introspection --with-gtk=3.0 \
-      --enable-gtk-doc
-  make
-  popd
-}
-
-package_vte(){
-  pkgdesc+=" GTK2"
-  depends=('gtk2' 'vte-common')
-  cd "${srcdir}/${pkgbase}-${pkgver}"/build-gtk2
-  make DESTDIR="${pkgdir}" install
-
-  rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper
-}
-
-package_vte3(){
-  pkgdesc+=" GTK3"
-  depends=('gtk3' 'vte-common')
-  cd "${srcdir}/${pkgbase}-${pkgver}"/build-gtk3
-  make DESTDIR="${pkgdir}" install
-
-  rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper
-}
-
-package_vte-common() {
-  pkgdesc="Common files used by vte and vte3"
-  cd "${srcdir}/${pkgbase}-${pkgver}"/build-gtk3
-
-  make -C gnome-pty-helper DESTDIR="${pkgdir}" install
-}
diff --git a/testing/yelp/PKGBUILD b/testing/yelp/PKGBUILD
deleted file mode 100644
index c68a296b4..000000000
--- a/testing/yelp/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 120703 2011-04-26 05:18:34Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=yelp
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="A help browser for GNOME"
-arch=('i686' 'x86_64' 'mips64el')
-depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib'
-         'xz' 'bzip2' 'desktop-file-utils' 'dconf')
-makedepends=('intltool' 'gtk-doc')
-groups=('gnome')
-license=('GPL')
-options=('!emptydirs' '!libtool')
-url="http://www.gnome.org"
-install=yelp.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('6de6c45439b21a3042236d5d836de9dd44d59c2d4c324982c316b4b6834ce0a4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/yelp/yelp.install b/testing/yelp/yelp.install
deleted file mode 100644
index f3bf19a93..000000000
--- a/testing/yelp/yelp.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall yelp
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/zenity/PKGBUILD b/testing/zenity/PKGBUILD
deleted file mode 100644
index 202f80ecd..000000000
--- a/testing/zenity/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 118440 2011-04-06 21:18:58Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=zenity
-pkgver=3.0.0
-pkgrel=2
-pkgdesc="Display graphical dialog boxes from shell scripts"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL')
-depends=('gtk3' 'libnotify')
-makedepends=('intltool' 'gtk-doc')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b1965b6704e80665c551261b9895a06322aba3f9776f8e5dd8141c7e8aca5131')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
author	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-05-01 21:35:15 -0300
committer	Nicolas Reynolds <fauno@kiwwwi.com.ar>	2011-05-01 21:35:15 -0300
commit	4a662496845b00e9e85268bda9853ce13d5a4ba1 (patch)
tree	58f64df09a3fc9eb5e4cb7fbbe600216e591bfb5
parent	5a1b7efd1dfd0d0a1f4a7a4b68ea7b69f06aa6d1 (diff)
parent	3be02a9acbeb006d9a9e6136c54d91064cc7d80e (diff)