Mon May 28 20:14:39 UTC 2012

author: Parabola <dev@list.parabolagnulinux.org> 2012-05-28 20:14:47 +0000
committer: Parabola <dev@list.parabolagnulinux.org> 2012-05-28 20:14:47 +0000
commit: edec45419def1b81bd663a2859684ef55ba56269 (patch)
tree: caa3c2d5f4e55b38e7740a39d80a21507679c586 /staging
parent: 483f7de4ab6a706517279a24d2efc969f4a1996d (diff)
173 files changed, 0 insertions, 12121 deletions
diff --git a/staging/bluez/PKGBUILD b/staging/bluez/PKGBUILD
deleted file mode 100644
index 9d9043e53..000000000
--- a/staging/bluez/PKGBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# $Id: PKGBUILD 159751 2012-05-26 12:43:04Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-
-pkgname=bluez
-pkgver=4.99
-pkgrel=3
-pkgdesc="Libraries and tools for the Bluetooth protocol stack"
-url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('dbus-core' 'python2' 'udev')
-makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile')
-optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
-            "alsa-lib: Audio bluetooth devices support"
-            "dbus-python: to run bluez-simple-agent"
-            "pygobject: to run bluez-simple-agent"
-            "libusb-compat: USB adapters support"
-            "cups: CUPS backend")
-conflicts=('bluez-libs' 'bluez-utils')
-provides=('bluez-libs' 'bluez-utils')
-replaces=('bluez-libs' 'bluez-utils')
-options=('!libtool')
-backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
-        'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
-source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
-        'bluetooth.conf.d'
-	'rc.bluetooth')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/lib \
-    --enable-gstreamer \
-    --enable-alsa \
-    --enable-usb \
-    --enable-tools \
-    --enable-bccmd \
-    --enable-dfutool \
-    --enable-hid2hci \
-    --enable-hidd \
-    --enable-pand \
-    --enable-dund \
-    --enable-cups \
-    --enable-wiimote \
-    --disable-test
-
-  sed -ri 's,udev_get_(dev|sys)_path([^)]+\)),"/\1",g' tools/hid2hci.c
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth
-  
-  install -d ${pkgdir}/etc/bluetooth
-  install -m644 network/network.conf \
-                input/input.conf \
-                audio/audio.conf \
-                serial/serial.conf \
-    ${pkgdir}/etc/bluetooth/
-  
-  install -Dm644 ${srcdir}/bluetooth.conf.d \
-    ${pkgdir}/etc/conf.d/bluetooth
-
-  # FS#27630
-  install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent
-  install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device
-  install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input
-  sed -i 's#/usr/bin/python#/usr/bin/python2#' \
-    "${pkgdir}"/usr/bin/bluez-simple-agent \
-    "${pkgdir}"/usr/bin/bluez-test-device \
-    "${pkgdir}"/usr/bin/bluez-test-input
-
-  # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html
-#  rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules
-}
-md5sums=('2387053eb5a7b02f37df4871df022a02'
-         '7412982b440f29fa7f76a41a87fef985'
-         '8f9498707f809506928b2e480d3b6789')
diff --git a/staging/bluez/bluetooth.conf.d b/staging/bluez/bluetooth.conf.d
deleted file mode 100644
index 1c1e02589..000000000
--- a/staging/bluez/bluetooth.conf.d
+++ /dev/null
@@ -1,30 +0,0 @@
-# Bluetooth configuraton file
-
-# Bluetooth services (allowed values are "true" and "false")
-
-# Run the bluetoothd daemon (default: true)
-#DAEMON_ENABLE="false"
-
-# Run the sdp daemon (default: false)
-# If this is disabled, hcid's internal sdp daemon will be used
-#SDPD_ENABLE="true"
-
-# Run the bluetooth HID daemon (default: false)
-#HIDD_ENABLE="true"
-
-# Activate rfcomm ports (default: false)
-#RFCOMM_ENABLE="true"
-
-# Run bluetooth dial-up networking daemon (default: false)
-#DUND_ENABLE="true"
-
-# Run bluetooth PAN daemon (default: false)
-#PAND_ENABLE="true"
-
-# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf)
-#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-# Options for hidd, dund and pand (default: none)
-HIDD_OPTIONS="--server"
-#DUND_OPTIONS=""
-#PAND_OPTIONS=""
diff --git a/staging/bluez/rc.bluetooth b/staging/bluez/rc.bluetooth
deleted file mode 100644
index a46ee2abb..000000000
--- a/staging/bluez/rc.bluetooth
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/bash
-#
-# Start/stop the Bluetooth daemons
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME="bluetoothd"
-HIDD_NAME="hidd"
-RFCOMM_NAME="rfcomm"
-PAND_NAME="pand"
-DUND_NAME="dund"
-
-DAEMON_EXEC="/usr/sbin/bluetoothd"
-HIDD_EXEC="/usr/bin/hidd"
-RFCOMM_EXEC="/usr/bin/rfcomm"
-PAND_EXEC="/usr/bin/pand"
-DUND_EXEC="/usr/bin/dund"
-
-DAEMON_ENABLE="true"
-HIDD_ENABLE="false"
-RFCOMM_ENABLE="false"
-DUND_ENABLE="false"
-PAND_ENABLE="false"
-
-RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-HIDD_OPTIONS=""
-DUND_OPTIONS=""
-PAND_OPTIONS=""
-
-[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-
-case "$1" in
-  start)
-    stat_busy "Starting bluetooth subsystem:"
-    if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then
-      stat_append " $DAEMON_NAME"
-      $DAEMON_EXEC
-      sleep 1
-    fi
-    if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then
-      stat_append " $SDPD_NAME"
-      $SDPD_EXEC
-    fi
-    if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then
-      stat_append " $HIDD_NAME"
-      $HIDD_EXEC $HIDD_OPTIONS
-    fi
-    if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then
-      stat_append " $RFCOMM_NAME"
-      $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all
-    fi
-    if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then
-      stat_append " $DUND_NAME"
-      $DUND_EXEC $DUND_OPTIONS
-    fi
-    if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then
-      stat_append " $PAND_NAME"
-      $PAND_EXEC $PAND_OPTIONS
-    fi
-    add_daemon bluetooth
-    stat_done
-    ;;
-  stop)
-    stat_busy "Stopping bluetooth subsystem:"
-
-    stat_append " $PAND_NAME"
-    killall $PAND_NAME >/dev/null 2>&1
-
-    stat_append " $DUND_NAME"
-    killall $DUND_NAME >/dev/null 2>&1
-
-    if [ -x "$RFCOMM_EXEC" ]; then
-      stat_append " $RFCOMM_NAME"
-      $RFCOMM_EXEC release all >/dev/null 2>&1
-    fi
-
-    stat_append " $HIDD_NAME"
-    killall $HIDD_NAME >/dev/null 2>&1
-
-    stat_append " $SDPD_NAME"
-    killall $SDPD_NAME >/dev/null 2>&1
-
-    stat_append " $DAEMON_NAME"
-    killall $DAEMON_NAME >/dev/null 2>&1
-
-    rm_daemon bluetooth
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/staging/cairo-perl/PKGBUILD b/staging/cairo-perl/PKGBUILD
deleted file mode 100644
index ba76f82c8..000000000
--- a/staging/cairo-perl/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 159743 2012-05-26 12:14:50Z bluewind $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=cairo-perl
-pkgver=1.082
-pkgrel=2
-pkgdesc="Perl wrappers for cairo"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://gtk2-perl.sourceforge.net/"
-options=('!emptydirs')
-depends=('cairo' 'perl')
-makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Cairo-${pkgver}.tar.gz
-        testsuite.patch)
-md5sums=('cfd61e519ff20023979c255d4040fe06'
-         '6a3ceac304a5a53f8fdd5652d98f6855')
-
-build() {
-  cd "${srcdir}/Cairo-${pkgver}"
-  patch -Np1 -i "${srcdir}/testsuite.patch"
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/Cairo-${pkgver}"
-  make test
-}
-
-package() {
-  cd "${srcdir}/Cairo-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/cairo-perl/testsuite.patch b/staging/cairo-perl/testsuite.patch
deleted file mode 100644
index 59cb58f28..000000000
--- a/staging/cairo-perl/testsuite.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 21dd8a0600cbfac46723c7745b377fce94c8bdc3 Mon Sep 17 00:00:00 2001
-From: Torsten Schönfeld <kaffeetisch@gmx.de>
-Date: Sat, 31 Mar 2012 10:34:11 +0000
-Subject: Fix compiling and testing against older versions of cairo
-
----
-(limited to 't/CairoPath.t')
-
-diff --git a/t/CairoPath.t b/t/CairoPath.t
-index e515172..770e464 100644
---- a/t/CairoPath.t
-+++ b/t/CairoPath.t
-@@ -11,11 +11,17 @@ use strict;
- use warnings;
- use Cairo;
- 
--use Test::More tests => 6;
-+use Test::More;
- 
- use constant IMG_WIDTH => 256;
- use constant IMG_HEIGHT => 256;
- 
-+if (Cairo::VERSION >= Cairo::VERSION_ENCODE (1, 4, 0)) {
-+  plan tests => 6;
-+} else {
-+  plan skip_all => 'path behavior not predictable on cairo < 1.4';
-+}
-+
- my $surf = Cairo::ImageSurface->create ('rgb24', IMG_WIDTH, IMG_HEIGHT);
- my $cr = Cairo::Context->create ($surf);
- 
---
-cgit v0.9.0.2
-From a1cd2e45b4ee49a724ae5d7e854ad9829eebf00d Mon Sep 17 00:00:00 2001
-From: Torsten Schönfeld <kaffeetisch@gmx.de>
-Date: Sat, 07 Apr 2012 18:01:31 +0000
-Subject: Make t/CairoPath.t more robust
-
-The end of a path that took a round trip into cairo and back might differ
-for different versions of cairo.  Hence, compare only the beginning with
-the expected path.
----
-diff --git a/t/CairoPath.t b/t/CairoPath.t
-index 770e464..27a3aad 100644
---- a/t/CairoPath.t
-+++ b/t/CairoPath.t
-@@ -11,17 +11,11 @@ use strict;
- use warnings;
- use Cairo;
- 
--use Test::More;
-+use Test::More tests => 18;
- 
- use constant IMG_WIDTH => 256;
- use constant IMG_HEIGHT => 256;
- 
--if (Cairo::VERSION >= Cairo::VERSION_ENCODE (1, 4, 0)) {
--  plan tests => 6;
--} else {
--  plan skip_all => 'path behavior not predictable on cairo < 1.4';
--}
--
- my $surf = Cairo::ImageSurface->create ('rgb24', IMG_WIDTH, IMG_HEIGHT);
- my $cr = Cairo::Context->create ($surf);
- 
-@@ -40,14 +34,7 @@ my $expected_path = [
- ];
- 
- my $path = $cr->copy_path;
--is_deeply ($path, $expected_path);
--
--sub paths_agree {
--  my ($cr, $path, $expected_path) = @_;
--  $cr->new_path;
--  $cr->append_path ($path);
--  is_deeply ($cr->copy_path, $expected_path);
--}
-+paths_agree ($path, $expected_path);
- 
- # Modifying single point values.
- foreach ($path, $expected_path) {
-@@ -57,21 +44,21 @@ foreach ($path, $expected_path) {
-   $_->[2]{points}[2][0] = 99;
-   $_->[2]{points}[2][1] = 1010;
- }
--paths_agree ($cr, $path, $expected_path);
-+path_round_trip_ok ($cr, $path, $expected_path);
- 
- # Modifying single points.
- foreach ($path, $expected_path) {
-   $_->[1]{points}[0] = [333, 444];
-   $_->[2]{points}[2] = [77, 88];
- }
--paths_agree ($cr, $path, $expected_path);
-+path_round_trip_ok ($cr, $path, $expected_path);
- 
- # Replacing all points.
- foreach ($path, $expected_path) {
-   $_->[1]{points} = [[3333, 4444]];
-   $_->[2]{points} = [[55, 66], [77, 88], [99, 1010]];
- }
--paths_agree ($cr, $path, $expected_path);
-+path_round_trip_ok ($cr, $path, $expected_path);
- 
- # Replacing and adding path segments.
- my @cloned_path = @{$path};
-@@ -86,9 +73,24 @@ foreach (\@cloned_path, $expected_path) {
-     type => 'line-to',
-     points => [[23, 42]] };
- }
--paths_agree ($cr, \@cloned_path, $expected_path);
-+path_round_trip_ok ($cr, \@cloned_path, $expected_path);
- 
- # Passing bare arrays into Cairo.
- $cr->new_path;
- $cr->append_path ($expected_path);
--is_deeply ($cr->copy_path, $expected_path);
-+paths_agree ($cr->copy_path, $expected_path);
-+
-+sub path_round_trip_ok {
-+  my ($cr, $path, $expected_path) = @_;
-+  $cr->new_path;
-+  $cr->append_path ($path);
-+  paths_agree ($cr->copy_path, $expected_path);
-+}
-+
-+sub paths_agree {
-+  my ($path, $expected_path) = @_;
-+  # Only the first three entries seem to be reliable across cairo versions.
-+  for (0..2) {
-+    is_deeply ($path->[$_], $expected_path->[$_]);
-+  }
-+}
---
-cgit v0.9.0.2
diff --git a/staging/calligra/PKGBUILD b/staging/calligra/PKGBUILD
deleted file mode 100644
index 940e96ab4..000000000
--- a/staging/calligra/PKGBUILD
+++ /dev/null
@@ -1,264 +0,0 @@
-# $Id: PKGBUILD 158988 2012-05-14 10:08:49Z andrea $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=calligra
-pkgname=('calligra-filters'
-         'calligra-interfaces'
-         'calligra-libs'
-         'calligra-plugins'
-         'calligra-pics'
-         'calligra-servicetypes'
-         'calligra-templates'
-         'calligra-tools'
-         'calligra-karbon'
-         'calligra-kexi'
-         'calligra-kounavail'
-         'calligra-plan'
-         'calligra-stage'
-         'calligra-krita'
-         'calligra-sheets'
-         'calligra-words'
-         'calligra-handbook'
-         'calligra-braindump'
-         'calligra-flow')
-pkgver=2.4.1
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.calligra-suite.org/'
-license=('FDL1.2' 'GPL2' 'LGPL')
-makedepends=('cmake' 'automoc4' 'boost ' 'eigen2'
-             'kdepimlibs' 'libpqxx' 'freetds' 'xbase'
-             'kdegraphics-okular' 'gsl' 'kdeedu-marble'
-             'libwpd' 'libwpg' 'pstoedit' 'glew'
-             'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2')
-groups=('calligra')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('a4da7e1181e1539850a4fcae466d7d75')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_active=OFF \
-    -DBUILD_mobile=OFF \
-    -DIHAVEPATCHEDQT=1
-  make
-}
-
-package_calligra-filters() {
-  pkgdesc="Filters for the Calligra office suite"
-  optdepends=('libwpg: Corel WordPerfect Graphics image importer')
-  conflicts=('koffice-filters')
-  replaces=('koffice-filters')
-  install=calligra-filters.install
-
-  cd "${srcdir}"/build/filters
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-interfaces() {
-  pkgdesc="Interfaces for the Calligra office suite"
-  depends=('calligra-libs')
-  conflicts=('koffice-interfaces')
-  replaces=('koffice-interfaces')
-
-  cd "${srcdir}"/build/interfaces
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-libs() {
-  pkgdesc="Libraries for the Calligra office suite"
-  depends=('kdepimlibs' 'lcms2' 'calligra-servicetypes')
-  conflicts=('koffice-libs')
-  replaces=('koffice-libs')
-
-  cd "${srcdir}"/build/libs
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-plugins() {
-  pkgdesc="Plugins for the Calligra office suite"
-  depends=('calligra-libs' 'calligra-filters')
-  optdepends=('kdeedu-marble: map shape for Calligra')
-  conflicts=('koffice-plugins' 'koffice-kchart')
-  replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula')
-
-  cd "${srcdir}"/build/plugins
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-pics() {
-  pkgdesc="Icons for the Calligra office suite"
-  conflicts=('koffice-pics')
-  replaces=('koffice-pics')
-  install=calligra.install
-
-  cd "${srcdir}"/build/pics
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-servicetypes() {
-  pkgdesc="Servicetypes for the Calligra office suite"
-  conflicts=('koffice-servicetypes')
-  replaces=('koffice-servicetypes')
-  install=calligra.install
-
-  cd "${srcdir}"/build/servicetypes
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-templates() {
-  pkgdesc="Templates for the Calligra office suite"
-  conflicts=('koffice-templates')
-  replaces=('koffice-templates')
-
-  cd "${srcdir}"/build/templates
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-tools() {
-  pkgdesc="Tools for the Calligra office suite"
-  depends=('calligra-libs')
-  conflicts=('koffice-tools')
-  replaces=('koffice-tools')
-  install=calligra-tools.install
-
-  cd "${srcdir}"/build/tools
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-karbon() {
-  pkgdesc="Create scalable vector drawings"
-  depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime')
-  optdepends=('calligra-filters: import/export filters'
-              'calligra-tools: extra calligra tools')
-  conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
-  replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc')
-  install=calligra-karbon.install
-
-  cd "${srcdir}"/build/karbon
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-kexi() {
-  pkgdesc="Develop desktop database applications"
-  depends=('calligra-libs' 'calligra-templates')
-  optdepends=('libmysqlclient: MySQL driver'
-              'libpqxx: PostgreSQL driver'
-              'freetds: Sybase & MS SQL driver'
-              'xbase: XBase driver'
-              'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
-              'kdeedu-marble: map form widget'
-              'calligra-plugins: extra calligra plugins')
-  conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
-  replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc')
-  install=calligra-kexi.install
-
-  cd "${srcdir}"/build/kexi
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-kounavail() {
-  pkgdesc="Unavailable Calligra Document"
-  depends=('calligra-libs')
-  conflicts=('koffice-kounavail')
-  replaces=('koffice-kounavail')
-
-  cd "${srcdir}"/build/kounavail
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-plan() {
-  pkgdesc="Calligra Project Management Component"
-  depends=('calligra-words')
-  conflicts=('koffice-kplato' 'calligra-kplato')
-  replaces=('koffice-kplato' 'calligra-kplato')
-  install=calligra-plan.install
-
-  cd "${srcdir}"/build/plan
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-stage() {
-  pkgdesc="Write presentation documents"
-  depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime')
-  optdepends=('calligra-plugins: extra calligra plugins')
-  conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
-  replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc')
-  install=calligra-stage.install
-
-  cd "${srcdir}"/build/stage
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-krita() {
-  pkgdesc="Edit and paint images"
-  depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime'
-           'qimageblitz' 'poppler-qt' 'opengtl' 'glew' 'libkdcraw' 'fftw')
-  conflicts=('koffice-krita' 'calligra-krita-doc')
-  replaces=('koffice-krita' 'calligra-krita-doc')
-  install=calligra-krita.install
-
-  cd "${srcdir}"/build/krita
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-sheets() {
-  pkgdesc="Write spreadsheet documents"
-  depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime')
-  optdepends=('calligra-filters: import/export filters'
-              'calligra-plugins: extra calligra plugins'
-              'calligra-tools: extra calligra tools')
-  conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
-  replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
-  install=calligra-sheets.install
-
-  cd "${srcdir}"/build/sheets
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-words() {
-  pkgdesc="Word Processor"
-  depends=('calligra-templates' 'calligra-pics' 'calligra-kounavail'
-           'calligra-plugins' 'kdegraphics-okular')
-  optdepends=('calligra-tools: extra calligra tools')
-  conflicts=('koffice-kword')
-  replaces=('koffice-kword')
-  install=calligra-words.install
-
-  cd "${srcdir}"/build/words
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-handbook() {
-  pkgdesc="Documentation for Calligra"
-  conflicts=('koffice-handbook')
-  replaces=('koffice-handbook')
-
-  cd "${srcdir}"/build/doc/calligra
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-braindump() {
-  pkgdesc="Notes and idea gathering"
-  depends=('calligra-libs' 'kdebase-runtime')
-  install=calligra-braindump.install
-
-  cd "${srcdir}"/build/braindump
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-flow() {
-  pkgdesc="Flowchart & Diagram Editing"
-  depends=('calligra-libs' 'kdebase-runtime')
-  conflicts=('calligra-flow-doc')
-  replaces=('calligra-flow-doc')
-  install=calligra-flow.install
-
-  cd "${srcdir}"/build/flow
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/calligra/calligra-braindump.install b/staging/calligra/calligra-braindump.install
deleted file mode 100644
index c2179f6e2..000000000
--- a/staging/calligra/calligra-braindump.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
-\ No newline at end of file
diff --git a/staging/calligra/calligra-filters.install b/staging/calligra/calligra-filters.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/staging/calligra/calligra-filters.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/calligra/calligra-flow.install b/staging/calligra/calligra-flow.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/staging/calligra/calligra-flow.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/calligra/calligra-karbon.install b/staging/calligra/calligra-karbon.install
deleted file mode 100644
index c2179f6e2..000000000
--- a/staging/calligra/calligra-karbon.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
-\ No newline at end of file
diff --git a/staging/calligra/calligra-kexi.install b/staging/calligra/calligra-kexi.install
deleted file mode 100644
index b8c7ebf27..000000000
--- a/staging/calligra/calligra-kexi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/calligra/calligra-krita.install b/staging/calligra/calligra-krita.install
deleted file mode 100644
index 33d234a02..000000000
--- a/staging/calligra/calligra-krita.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
-\ No newline at end of file
diff --git a/staging/calligra/calligra-plan.install b/staging/calligra/calligra-plan.install
deleted file mode 100644
index c2179f6e2..000000000
--- a/staging/calligra/calligra-plan.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
-\ No newline at end of file
diff --git a/staging/calligra/calligra-sheets.install b/staging/calligra/calligra-sheets.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/staging/calligra/calligra-sheets.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/calligra/calligra-stage.install b/staging/calligra/calligra-stage.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/staging/calligra/calligra-stage.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/calligra/calligra-tools.install b/staging/calligra/calligra-tools.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/staging/calligra/calligra-tools.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/calligra/calligra-words.install b/staging/calligra/calligra-words.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/staging/calligra/calligra-words.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/calligra/calligra.install b/staging/calligra/calligra.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/calligra/calligra.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/staging/claws-mail-extra-plugins/PKGBUILD b/staging/claws-mail-extra-plugins/PKGBUILD
deleted file mode 100644
index 04657c451..000000000
--- a/staging/claws-mail-extra-plugins/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 159502 2012-05-25 16:03:35Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Mildred <mildred593 at online dot fr>
-
-pkgname=claws-mail-extra-plugins
-pkgver=3.8.0
-pkgrel=3
-pkgdesc="Extra plugins for claws-mail"
-url="http://www.claws-mail.org/plugins.php?branch=EXT"
-license=('GPL3')
-arch=('i686' 'x86_64')
-depends=('claws-mail>=3.8.0')
-makedepends=('make' 'bc' 'perl>=5.16.0' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7'
-             'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1'
-             'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata')
-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'
-	    'libgdata: for gdata 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)
-md5sums=('4776f6e0357a694f384349ac73b6da52')
-
-build() {
-  cd "$srcdir/claws-mail-extra-plugins-$pkgver"
-
-  # fix for python2
-  export PYTHON="/usr/bin/python2"
-
-  # fix gdata plugin build
-  sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.3/configure
- 
-  for dir in */; do
-    [[ $dir != geolocation_plugin-* ]] && (
-      cd $dir
-
-      ./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/staging/cups-filters/PKGBUILD b/staging/cups-filters/PKGBUILD
deleted file mode 100644
index 62cbe9a91..000000000
--- a/staging/cups-filters/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 158958 2012-05-13 16:11:10Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=cups-filters
-pkgver=1.0.17
-pkgrel=2
-pkgdesc="OpenPrinting CUPS Filters"
-arch=('i686' 'x86_64')
-url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
-license=('GPL')
-groups=()
-depends=('ghostscript' 'lcms2' 'poppler') # bc ? https://bugs.archlinux.org/task/29808
-makedepends=()
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-#options=(!makeflags)
-install=
-source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz)
-md5sums=('5132b018cc503e9338fbd029acf56e55')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-#check() {
-#  cd "$srcdir/$pkgname-$pkgver"
-#  make -k check
-#}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  #make DESTDIR="$pkgdir/" install
-  make install BUILDROOT="$pkgdir/"
-  # drop static lib
-  rm -f ${pkgdir}/usr/lib/*.a
-}
diff --git a/staging/easytag/PKGBUILD b/staging/easytag/PKGBUILD
deleted file mode 100644
index eb59f4ae0..000000000
--- a/staging/easytag/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 159784 2012-05-26 23:49:07Z tomegun $
-# Maintainer:
-# Contributor: Kevin Piche <kevin@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=easytag
-pkgver=2.1.7
-pkgrel=2
-pkgdesc="Utility for viewing, editing and writing ID3 tags of your MP3 files"
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://easytag.sourceforge.net/'
-depends=('id3lib' 'libid3tag' 'gtk2' 'libvorbis' 'flac' 'speex' 'wavpack' 'desktop-file-utils')
-install=${pkgname}.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('9df3e800d80e754670642f2ba5e03539')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/staging/easytag/easytag.install b/staging/easytag/easytag.install
deleted file mode 100644
index 93908edac..000000000
--- a/staging/easytag/easytag.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/staging/frozen-bubble/PKGBUILD b/staging/frozen-bubble/PKGBUILD
deleted file mode 100644
index c4428993a..000000000
--- a/staging/frozen-bubble/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 159777 2012-05-26 19:52:21Z foutrelis $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Brandon Niemczyk <maccorin@cfl.rr.com>
-
-pkgname=frozen-bubble
-_pkgver=2.2.1-beta1
-pkgver=${_pkgver/-/}
-pkgrel=4
-pkgdesc="A game in which you throw colorful bubbles and build groups to destroy the bubbles"
-arch=(i686 x86_64)
-url="http://www.frozen-bubble.org"
-license=(GPL2)
-depends=(perl-sdl perl-ipc-system-simple perl-compress-bzip2 perl-file-which)
-makedepends=(perl-file-slurp perl-locale-maketext-lexicon)
-options=('!emptydirs')
-source=(http://www.frozen-bubble.org/data/$pkgname-$_pkgver.tar.bz2 \
-        frozen-bubble.desktop)
-md5sums=('825cc23ed806838b9d86de9982a5687a'
-         '01b10b77ba6ad856f5c199121c582272')
-
-build() {
-  cd "$srcdir/$pkgname-$_pkgver"
-  unset CFLAGS
-  # install module in vendor directories
-  perl Build.PL installdirs=vendor
-  perl Build
-}
-
-check() {
-  cd "$srcdir/$pkgname-$_pkgver"
-  perl Build test
-}
-
-package() {
-  cd "$srcdir/$pkgname-$_pkgver"
-  perl Build install destdir="$pkgdir"
-
-  install -D -m644 share/icons/frozen-bubble-icon-64x64.png "$pkgdir/usr/share/pixmaps/frozen-bubble.png"
-  install -D -m644 "$srcdir/frozen-bubble.desktop" "$pkgdir/usr/share/applications/frozen-bubble.desktop"
-}
diff --git a/staging/frozen-bubble/frozen-bubble.desktop b/staging/frozen-bubble/frozen-bubble.desktop
deleted file mode 100644
index 76a7bcd88..000000000
--- a/staging/frozen-bubble/frozen-bubble.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Encoding=UTF-8
-Name=Frozen Bubble
-Icon=frozen-bubble.png
-Exec=/usr/bin/vendor_perl/frozen-bubble
-Terminal=false
-Categories=Game;
diff --git a/staging/gconf-perl/PKGBUILD b/staging/gconf-perl/PKGBUILD
deleted file mode 100644
index e63bf621d..000000000
--- a/staging/gconf-perl/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 159747 2012-05-26 12:22:57Z bluewind $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gconf-perl
-pkgver=1.044
-pkgrel=7
-pkgdesc="Gnome2-GConf perl bindings for gconf"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gtk2-perl.sourceforge.net/"
-makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-depends=('glib-perl' 'gconf' 'perl')
-options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gnome2-GConf-${pkgver}.tar.gz
-        disable-orbit.patch)
-md5sums=('ea386003b18f067524833b0eeb271330'
-         '14852fc936ce7b552eb204913d55fd1c')
-
-build() {
-  cd "${srcdir}/Gnome2-GConf-${pkgver}"
-  patch -Np1 -i "${srcdir}/disable-orbit.patch"
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/Gnome2-GConf-${pkgver}"
-  dbus-launch --exit-with-session make test
-}
-
-package() {
-  cd "${srcdir}/Gnome2-GConf-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/gconf-perl/disable-orbit.patch b/staging/gconf-perl/disable-orbit.patch
deleted file mode 100644
index da526ec2e..000000000
--- a/staging/gconf-perl/disable-orbit.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Disable gconf_engine_key_is_writable
- This symbol is not available in libgconf when it is configured without
- ORBit support, which is currently the case in Debian.
-Author: Colin Watson <cjwatson@ubuntu.com>
-Bug-Debian: http://bugs.debian.org/649055
-Forwarded: no
-Last-Update: 2011-11-17
-
-Index: b/xs/GConfEngine.xs
-===================================================================
---- a/xs/GConfEngine.xs
-+++ b/xs/GConfEngine.xs
-@@ -350,6 +350,8 @@
- 	if (err)
- 		gperl_croak_gerror (NULL, err);
- 
-+#if 0 /* requires gconf to be configured with ORBit support */
-+
- ##gboolean gconf_engine_key_is_writable  (GConfEngine *conf,
- ##                                        const gchar *key,
- ##                                        GError     **err);
-@@ -366,6 +368,8 @@
-     OUTPUT:
-         RETVAL
- 
-+#endif
-+
- guint
- gconf_engine_notify_add (engine, namespace_section, func, data=NULL)
- 	GConfEngine * engine
diff --git a/staging/gegl/PKGBUILD b/staging/gegl/PKGBUILD
deleted file mode 100644
index 858b8593e..000000000
--- a/staging/gegl/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 158346 2012-05-03 21:27:34Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gegl
-pkgver=0.2.0
-pkgrel=1
-pkgdesc="Graph based image processing framework"
-arch=('i686' 'x86_64')
-url="http://www.gegl.org/"
-license=('GPL3' 'LGPL3')
-depends=('babl' 'gtk2')
-makedepends=('intltool' 'ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2')
-optdepends=('openexr: for using the openexr plugin' \
-            'ffmpeg: for using the ffmpeg plugin' \
-            'librsvg: for using the svg plugin' \
-            'jasper: for using the jasper plugin')
-options=('!libtool')
-source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure  --prefix=/usr  --with-sdl --with-openexr --with-librsvg \
-    --with-libavformat --with-jasper --disable-docs
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/gimp-devel/PKGBUILD b/staging/gimp-devel/PKGBUILD
deleted file mode 100644
index a4baf7eab..000000000
--- a/staging/gimp-devel/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 158530 2012-05-04 00:33:40Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gimp-devel
-pkgver=2.8.0
-pkgrel=1
-pkgdesc="GNU Image Manipulation Program (Development Version)"
-arch=('i686' 'x86_64')
-url="http://www.gimp.org/"
-license=('GPL3' 'LGPL3')
-depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'librsvg' 'libmng' 'dbus-glib' \
-         'jasper' 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript')
-optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
-            'libwebkit: for the help browser or web-page plug-ins'
-            'poppler-glib: for pdf support'
-            'alsa-lib: for MIDI event controller module'
-            'curl: for URI support'
-            'ghostscript: for postscript support')
-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=('28997d14055f15db063eb92e1c8a7ebb'
-         'bb27bc214261d36484093e857f015f38')
-
-build() {
-  cd "${srcdir}/gimp-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-mp --enable-gimp-console --enable-python --with-libcurl \
-    --with-gif-compression=lzw --without-aa --without-gvfs
-  make
-}
-
-#check() {
-#  cd "${srcdir}/gimp-${pkgver}"
-#  make check
-#}
-
-package() {
-  cd "${srcdir}/gimp-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  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 -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
-  ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
-  ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
-}
diff --git a/staging/gimp-devel/gimp-devel.install b/staging/gimp-devel/gimp-devel.install
deleted file mode 100644
index c317fbaca..000000000
--- a/staging/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/staging/gimp-devel/linux.gpl b/staging/gimp-devel/linux.gpl
deleted file mode 100644
index 0a73d8979..000000000
--- a/staging/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/staging/glib-perl/PKGBUILD b/staging/glib-perl/PKGBUILD
deleted file mode 100644
index 6f0b83b09..000000000
--- a/staging/glib-perl/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 159741 2012-05-26 12:00:57Z bluewind $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sarah Hay <sarah@archlinux.org>
-
-pkgname=glib-perl
-pkgver=1.242
-pkgrel=2
-pkgdesc="Perl wrappers for glib 2.x, including GObject"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://gtk2-perl.sourceforge.net/"
-options=('!emptydirs')
-depends=('glib2>=2.24.1' 'perl>=5.14')
-makedepends=('perl-extutils-depends>=0.302' 'perl-extutils-pkgconfig>=1.12')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz)
-md5sums=('59c176888e8ef8139c4e1b8c2d45f1d0')
-
-build() {
-  cd "${srcdir}/Glib-${pkgver}"
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/Glib-${pkgver}"
-  make test
-}
-
-package() {
-  cd "${srcdir}/Glib-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/graphicsmagick/PKGBUILD b/staging/graphicsmagick/PKGBUILD
deleted file mode 100644
index 96cb72b92..000000000
--- a/staging/graphicsmagick/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 159767 2012-05-26 17:25:12Z bluewind $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Anton Leontiev <bunder@t-25.ru>
-
-pkgname=graphicsmagick
-pkgver=1.3.15
-pkgrel=2
-pkgdesc='Image processing system'
-url='http://www.graphicsmagick.org/'
-arch=('i686' 'x86_64')
-license=('MIT')
-makedepends=('perl')
-depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz'
-         'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
-sha1sums=('d5df4000d5531fad3ede9e008f9c8dc2d085d546')
-
-build() {
-	cd "${srcdir}/GraphicsMagick-${pkgver}"
-
-	# fix typemap bug
-	# https://rt.cpan.org/Public/Bug/Display.html?id=70150
-	# http://trac.imagemagick.org/browser/ImageMagick/branches/ImageMagick-6.7.7/PerlMagick/typemap
-	echo 'Graphics::Magick T_PTROBJ' > typemap
-
-	./configure \
-		--prefix=/usr \
-		--with-perl \
-		--enable-shared \
-		--disable-static \
-		--with-gs-font-dir=/usr/share/fonts/Type1 \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/GraphicsMagick-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	# Install MIT license
-	install -Dm644 "Copyright.txt" "${pkgdir}/usr/share/licenses/${pkgname}/Copyright.txt"
-
-	# Install perl bindings
-	# The patching was introduced in order to build perl module without installing package itself and
-	# not to introduce unnecessary path into LD_RUN_PATH
-	cd PerlMagick
-	sed -i -e "s:'LDDLFLAGS'  => \"\(.*\)\":'LDDLFLAGS'  => \"-L${pkgdir}/usr/lib \1\":" Makefile.PL
-	perl Makefile.PL INSTALLDIRS=vendor PREFIX=/usr DESTDIR="${pkgdir}"
-	sed -i -e "s/LDLOADLIBS =/LDLOADLIBS = -lGraphicsMagick/" Makefile
-	make
-	make install
-
-	# Remove perllocal.pod and .packlist
-	rm -rf "${pkgdir}/usr/lib/perl5/core_perl"
-	rm "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Graphics/Magick/.packlist"
-}
diff --git a/staging/graphviz/LICENSE b/staging/graphviz/LICENSE
deleted file mode 100644
index 16cc69a52..000000000
--- a/staging/graphviz/LICENSE
+++ /dev/null
@@ -1,87 +0,0 @@
-Eclipse Public License - v 1.0
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
diff --git a/staging/graphviz/PKGBUILD b/staging/graphviz/PKGBUILD
deleted file mode 100644
index 0803f3ae3..000000000
--- a/staging/graphviz/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 159450 2012-05-24 13:08:54Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: kevin <kevin@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-pkgname=graphviz
-pkgver=2.28.0
-pkgrel=10
-pkgdesc='Graph visualization software'
-url='http://www.graphviz.org/'
-license=('custom:EPL')
-arch=('i686' 'x86_64')
-depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
-makedepends=('swig' 'mono' 'guile' 'lua' 'ocaml' 'perl' 'php' 'python2' 'r' 'ruby' 'tk' 'qt')
-optdepends=('mono: sharp bindings'
-            'guile: guile bindings'
-            'lua: lua bindings'
-            'ocaml: ocaml bindings'
-            'perl: perl bindings'
-            'php: php bindings'
-            'python2: python bindings'
-            'r: r bindings'
-            'ruby: ruby bindings'
-            'tcl: tcl bindings'
-            'qt: gvedit')
-source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
-        'LICENSE')
-sha1sums=('4725d88a13e071ee22e632de551d4a55ca08ee7d'
-          'e78277e502c29abb74b9587a5dc951ec392554ea')
-
-options=('!libtool')
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed \
-		-e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-1.9.1/{$CARCH-linux,ruby/backward,})"'":' \
-		-e '/CONFIG/s:site:vendor:' \
-		-i config/config_ruby.rb
-
-	sed '/LIBPOSTFIX="64"/d' -i configure
-	export PYTHON=python2
-
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	# cf. http://www.graphviz.org/License.php
-	install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE
-}
diff --git a/staging/graphviz/install b/staging/graphviz/install
deleted file mode 100644
index 65fba522b..000000000
--- a/staging/graphviz/install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	rm -f usr/lib/graphviz/config{,6}
-	usr/bin/dot -c
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	rm -f usr/lib/graphviz/config{,6}
-}
diff --git a/staging/gtkpod/PKGBUILD b/staging/gtkpod/PKGBUILD
deleted file mode 100644
index 5e1b1d4f0..000000000
--- a/staging/gtkpod/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 159367 2012-05-22 19:05:45Z tomegun $
-# Contributor: Kevin Piche <kevin@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=gtkpod
-pkgver=2.1.1
-pkgrel=3
-pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
-arch=('i686' 'x86_64')
-url="http://gtkpod.sourceforge.net"
-license=('GPL')
-depends=('anjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk')
-makedepends=('flex' 'intltool')
-optdepends=('libmp4v2: MP4/h264 support'
-            'vorbis-tools: OGG support'
-            'id3v2: mp3 conversion support')
-install=gtkpod.install
-options=('!libtool')
-source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz")
-md5sums=('36fd0324fd1d1da00fcddacef1b09983')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's#python#python2#' scripts/sync-palm-jppy.py
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/gtkpod/gtkpod.install b/staging/gtkpod/gtkpod.install
deleted file mode 100644
index c5d357a38..000000000
--- a/staging/gtkpod/gtkpod.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/staging/gvfs/PKGBUILD b/staging/gvfs/PKGBUILD
deleted file mode 100644
index bb8fa6d9c..000000000
--- a/staging/gvfs/PKGBUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-# $Id: PKGBUILD 159759 2012-05-26 15:13:31Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.12.3
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2')
-url="http://www.gnome.org"
-options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)   
-sha256sums=('38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2')
-
-build() {
-  cd "$pkgbase-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gvfs \
-      --with-bash-completion-dir=/usr/share/bash-completion/completions
-  make
-}
-
-package_gvfs() {
-  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2')
-  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'
-              'gvfs-afp: Apple Filing Protocol (AFP) support')
-  install=gvfs.install
-
-  cd "$pkgbase-$pkgver"
-  sed -e 's/^am__append_4/#am__append_4/' \
-      -e 's/^am__append_5/#am__append_5/' \
-      -i monitor/Makefile
-  make DESTDIR="$pkgdir" install
-
-  cd "$pkgdir"
-  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
-  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,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 "$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 "$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 "$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 "$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"
-}
-
-package_gvfs-afp() {
-  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
-  depends=("gvfs=$pkgver")
-  install=gvfs-module.install
-  install -m755 -d "$pkgdir/usr/lib/gvfs"
-  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
-  install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
-}
diff --git a/staging/gvfs/gvfs-module.install b/staging/gvfs/gvfs-module.install
deleted file mode 100644
index 09d1f11ec..000000000
--- a/staging/gvfs/gvfs-module.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/staging/gvfs/gvfs-smb.install b/staging/gvfs/gvfs-smb.install
deleted file mode 100644
index da6a2ab6d..000000000
--- a/staging/gvfs/gvfs-smb.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/staging/gvfs/gvfs.install b/staging/gvfs/gvfs.install
deleted file mode 100644
index 3482d99e3..000000000
--- a/staging/gvfs/gvfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/staging/imagemagick/PKGBUILD b/staging/imagemagick/PKGBUILD
deleted file mode 100644
index eb31432ca..000000000
--- a/staging/imagemagick/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 159474 2012-05-24 20:45:24Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=imagemagick
-pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.7.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.imagemagick.org/"
-license=('custom')
-makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
-             'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper')
-source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
-        perlmagick.rpath.patch)
-sha1sums=('cf60b4e9ae6a55777082c7a0b1adb59f31f0865e'
-          '23405f80904b1de94ebd7bd6fe2a332471b8c283')
-
-build() {
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-
-  sed '/AC_PATH_XTRA/d' -i configure.ac
-  autoreconf --install
-  patch -p0 -i ../perlmagick.rpath.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
-    --enable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
-    --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
-    --with-perl --with-perl-options="INSTALLDIRS=vendor" \
-    --without-gvc --without-djvu --without-autotrace --without-webp \
-    --without-jbig --without-fpx --without-dps --without-fftw --without-lqr
-  make
-}
-
-check() {
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-#  make check
-}
-
-package_imagemagick() {
-  pkgdesc="An image viewing/manipulation program"
-  depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext')
-  optdepends=('ghostscript: for Ghostscript support' 
-              'openexr: for OpenEXR support' 
-              'libwmf: for WMF support' 
-              'librsvg: for SVG support' 
-              'libxml2: for XML support' 
-              'jasper: for JPEG-2000 support' 
-              'libpng: for PNG support')
-  backup=('etc/ImageMagick/coder.xml'
-          'etc/ImageMagick/colors.xml'
-          'etc/ImageMagick/delegates.xml'
-          'etc/ImageMagick/log.xml'
-          'etc/ImageMagick/magic.xml'
-          'etc/ImageMagick/mime.xml'
-          'etc/ImageMagick/policy.xml'
-          'etc/ImageMagick/quantization-table.xml'
-          'etc/ImageMagick/sRGB.icc'
-          'etc/ImageMagick/thresholds.xml'
-          'etc/ImageMagick/type.xml'
-          'etc/ImageMagick/type-dejavu.xml'
-          'etc/ImageMagick/type-ghostscript.xml'
-          'etc/ImageMagick/type-windows.xml')
-  options=('!docs' 'libtool' '!emptydirs')
-
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make DESTDIR="${pkgdir}" install
-  chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Image/Magick/Magick.so" 
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE"
-
-#Cleaning
-  find "${pkgdir}" -name '*.bs' -delete
-  rm -f "${pkgdir}"/usr/lib/*.la
-}
-
-package_imagemagick-doc() {
-  pkgdesc="The ImageMagick documentation (utilities manuals and libraries API)"
-
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make DESTDIR="${pkgdir}" install-data-html
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
-}
diff --git a/staging/imagemagick/perlmagick.rpath.patch b/staging/imagemagick/perlmagick.rpath.patch
deleted file mode 100644
index 958c0f2ee..000000000
--- a/staging/imagemagick/perlmagick.rpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	2009-05-26 16:22:11.000000000 -0300
-+++ Makefile.in	2009-05-26 16:23:27.000000000 -0300
-@@ -10067,6 +10067,7 @@
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
diff --git a/staging/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD
deleted file mode 100644
index fbecbdc23..000000000
--- a/staging/inkscape/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 158964 2012-05-13 20:05:21Z bisson $
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=inkscape
-pkgver=0.48.3.1
-pkgrel=3
-pkgdesc='Vector graphics editor using the SVG file format'
-url='http://inkscape.sourceforge.net/'
-license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
-makedepends=('boost' 'intltool')
-depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'popt'
-         'python2' 'desktop-file-utils' 'hicolor-icon-theme')
-optdepends=('pstoedit: latex formulas'
-            'texlive-core: latex formulas'
-            'python2-numpy: some extensions'
-            'python2-lxml: some extensions and filters'
-            'pyxml: some extensions'
-            'uniconvertor: reading/writing to some proprietary formats')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'poppler20.patch'
-        'libpng15.patch')
-sha1sums=('9a09a97d184e09c2ee7f9956bfe073b7313e919e'
-          '7316c2903c157781838cce289a709d100dc40fec'
-          'd6512f3cb38ca8e2436dc485aa652490d17b3a52')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
-	sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
-	sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
-	sed -i 's|python -c|python2 -c|g' configure share/extensions/uniconv*.py
-	sed -i 's|"python"|"python2"|g' src/main.cpp
-
-	patch -p1 -i ../poppler20.patch
-	patch -p1 -i ../libpng15.patch
-
-	./configure \
-		--prefix=/usr \
-		--with-python \
-		--with-perl \
-		--enable-lcms \
-		--enable-poppler-cairo \
-		--disable-dependency-tracking \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/inkscape/install b/staging/inkscape/install
deleted file mode 100644
index 6e803bf1d..000000000
--- a/staging/inkscape/install
+++ /dev/null
@@ -1,13 +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/staging/inkscape/libpng15.patch b/staging/inkscape/libpng15.patch
deleted file mode 100644
index e24913ed6..000000000
--- a/staging/inkscape/libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
-+++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1443,7 +1443,7 @@
-         return NULL;
-     }
-     // Set error handler
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         return NULL;
-     }
---- inkscape-0.48.1/src/helper/png-write.cpp
-+++ inkscape-0.48.1-mod//src/helper/png-write.cpp
-@@ -165,7 +165,7 @@
-     /* Set error handling.  REQUIRED if you aren't supplying your own
-      * error hadnling functions in the png_create_write_struct() call.
-      */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         /* If we get here, we had a problem reading the file */
-         fclose(fp);
-         png_destroy_write_struct(&png_ptr, &info_ptr);
---- inkscape-0.48.1/src/sp-image.cpp
-+++ inkscape-0.48.1-mod//src/sp-image.cpp
-@@ -386,9 +386,13 @@
- 
- #if defined(PNG_iCCP_SUPPORTED)
-                 {
--                    char* name = 0;
-+                    png_charp name = 0;
-                     int compression_type = 0;
--                    char* profile = 0;
-+#if (PNG_LIBPNG_VER < 10500)
-+                    png_charp profile = 0;
-+#else
-+                    png_bytep profile = 0;
-+#endif
-                     png_uint_32 proflen = 0;
-                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
- //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
diff --git a/staging/inkscape/poppler20.patch b/staging/inkscape/poppler20.patch
deleted file mode 100644
index ecb74603f..000000000
--- a/staging/inkscape/poppler20.patch
+++ /dev/null
@@ -1,642 +0,0 @@
-diff -Naur old/src/extension/internal/pdfinput/pdf-parser.cpp new/src/extension/internal/pdfinput/pdf-parser.cpp
---- old/src/extension/internal/pdfinput/pdf-parser.cpp	2011-07-08 20:25:09.468790000 +0200
-+++ new/src/extension/internal/pdfinput/pdf-parser.cpp	2012-05-13 21:07:11.334781215 +0200
-@@ -367,14 +367,14 @@
-     for (i = 0; i < obj->arrayGetLength(); ++i) {
-       obj->arrayGet(i, &obj2);
-       if (!obj2.isStream()) {
--	error(-1, const_cast<char*>("Weird page contents"));
-+	error(errInternal, -1, const_cast<char*>("Weird page contents"));
- 	obj2.free();
- 	return;
-       }
-       obj2.free();
-     }
-   } else if (!obj->isStream()) {
--    error(-1, const_cast<char*>("Weird page contents"));
-+    error(errInternal, -1, const_cast<char*>("Weird page contents"));
-     return;
-   }
-   parser = new Parser(xref, new Lexer(xref, obj), gFalse);
-@@ -419,7 +419,7 @@
- 
-     // too many arguments - something is wrong
-     } else {
--      error(getPos(), const_cast<char*>("Too many args in content stream"));
-+      error(errInternal, getPos(), const_cast<char*>("Too many args in content stream"));
-       if (printCommands) {
- 	printf("throwing away arg: ");
- 	obj.print(stdout);
-@@ -436,7 +436,7 @@
- 
-   // args at end with no command
-   if (numArgs > 0) {
--    error(getPos(), const_cast<char*>("Leftover args in content stream"));
-+    error(errInternal, getPos(), const_cast<char*>("Leftover args in content stream"));
-     if (printCommands) {
-       printf("%d leftovers:", numArgs);
-       for (i = 0; i < numArgs; ++i) {
-@@ -502,7 +502,7 @@
-   name = cmd->getCmd();
-   if (!(op = findOp(name))) {
-     if (ignoreUndef == 0)
--      error(getPos(), const_cast<char*>("Unknown operator '%s'"), name);
-+      error(errInternal, getPos(), const_cast<char*>("Unknown operator '%s'"), name);
-     return;
-   }
- 
-@@ -510,26 +510,26 @@
-   argPtr = args;
-   if (op->numArgs >= 0) {
-     if (numArgs < op->numArgs) {
--      error(getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name);
-+      error(errInternal, getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name);
-       return;
-     }
-     if (numArgs > op->numArgs) {
- #if 0
--      error(getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
-+      error(errInternal, getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
- #endif
-       argPtr += numArgs - op->numArgs;
-       numArgs = op->numArgs;
-     }
-   } else {
-     if (numArgs > -op->numArgs) {
--      error(getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"),
-+      error(errInternal, getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"),
- 	    numArgs, name);
-       return;
-     }
-   }
-   for (i = 0; i < numArgs; ++i) {
-     if (!checkArg(&argPtr[i], op->tchk[i])) {
--      error(getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"),
-+      error(errInternal, getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"),
- 	    i, name, argPtr[i].getTypeName());
-       return;
-     }
-@@ -690,7 +690,7 @@
-     return;
-   }
-   if (!obj1.isDict()) {
--    error(getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName());
-+    error(errInternal, getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName());
-     obj1.free();
-     return;
-   }
-@@ -705,7 +705,7 @@
-     if (state->parseBlendMode(&obj2, &mode)) {
-       state->setBlendMode(mode);
-     } else {
--      error(getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
-+      error(errInternal, getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
-     }
-   }
-   obj2.free();
-@@ -764,7 +764,7 @@
-       state->setTransfer(funcs);
-     }
-   } else if (!obj2.isNull()) {
--    error(getPos(), const_cast<char*>("Invalid transfer function in ExtGState"));
-+    error(errInternal, getPos(), const_cast<char*>("Invalid transfer function in ExtGState"));
-   }
-   obj2.free();
- 
-@@ -784,7 +784,7 @@
- 	funcs[0] = Function::parse(&obj3);
- 	if (funcs[0]->getInputSize() != 1 ||
- 	    funcs[0]->getOutputSize() != 1) {
--	  error(getPos(),
-+	  error(errInternal, getPos(),
- 		const_cast<char*>("Invalid transfer function in soft mask in ExtGState"));
- 	  delete funcs[0];
- 	  funcs[0] = NULL;
-@@ -809,11 +809,7 @@
- 	  blendingColorSpace = NULL;
- 	  isolated = knockout = gFalse;
- 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
- 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
--#else
--	    blendingColorSpace = GfxColorSpace::parse(&obj5);
--#endif
- 	  }
- 	  obj5.free();
- 	  if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
-@@ -840,15 +836,15 @@
- 	    delete funcs[0];
- 	  }
- 	} else {
--	  error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-+	  error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
- 	}
- 	obj4.free();
-       } else {
--	error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-+	error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-       }
-       obj3.free();
-     } else if (!obj2.isNull()) {
--      error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState"));
-+      error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState"));
-     }
-   }
-   obj2.free();
-@@ -876,7 +872,7 @@
-   // check form type
-   dict->lookup(const_cast<char*>("FormType"), &obj1);
-   if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
--    error(getPos(), const_cast<char*>("Unknown form type"));
-+    error(errInternal, getPos(), const_cast<char*>("Unknown form type"));
-   }
-   obj1.free();
- 
-@@ -884,7 +880,7 @@
-   dict->lookup(const_cast<char*>("BBox"), &obj1);
-   if (!obj1.isArray()) {
-     obj1.free();
--    error(getPos(), const_cast<char*>("Bad form bounding box"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad form bounding box"));
-     return;
-   }
-   for (i = 0; i < 4; ++i) {
-@@ -1012,19 +1008,11 @@
- 
-   state->setFillPattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-   if (obj.isNull()) {
-     colorSpace = GfxColorSpace::parse(&args[0], NULL);
-   } else {
-     colorSpace = GfxColorSpace::parse(&obj, NULL);
-   }
--#else
--  if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
--  } else {
--    colorSpace = GfxColorSpace::parse(&obj);
--  }
--#endif
-   obj.free();
-   if (colorSpace) {
-     state->setFillColorSpace(colorSpace);
-@@ -1032,7 +1020,7 @@
-     state->setFillColor(&color);
-     builder->updateStyle(state);
-   } else {
--    error(getPos(), const_cast<char*>("Bad color space (fill)"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad color space (fill)"));
-   }
- }
- 
-@@ -1043,19 +1031,11 @@
- 
-   state->setStrokePattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-   if (obj.isNull()) {
-     colorSpace = GfxColorSpace::parse(&args[0], NULL);
-   } else {
-     colorSpace = GfxColorSpace::parse(&obj, NULL);
-   }
--#else
--  if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
--  } else {
--    colorSpace = GfxColorSpace::parse(&obj);
--  }
--#endif
-   obj.free();
-   if (colorSpace) {
-     state->setStrokeColorSpace(colorSpace);
-@@ -1063,7 +1043,7 @@
-     state->setStrokeColor(&color);
-     builder->updateStyle(state);
-   } else {
--    error(getPos(), const_cast<char*>("Bad color space (stroke)"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad color space (stroke)"));
-   }
- }
- 
-@@ -1072,7 +1052,7 @@
-   int i;
- 
-   if (numArgs != state->getFillColorSpace()->getNComps()) {
--    error(getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command"));
-+    error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command"));
-     return;
-   }
-   state->setFillPattern(NULL);
-@@ -1088,7 +1068,7 @@
-   int i;
- 
-   if (numArgs != state->getStrokeColorSpace()->getNComps()) {
--    error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command"));
-+    error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command"));
-     return;
-   }
-   state->setStrokePattern(NULL);
-@@ -1109,7 +1089,7 @@
-       if (!((GfxPatternColorSpace *)state->getFillColorSpace())->getUnder() ||
- 	  numArgs - 1 != ((GfxPatternColorSpace *)state->getFillColorSpace())
- 	                     ->getUnder()->getNComps()) {
--	error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-+	error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
- 	return;
-       }
-       for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
-@@ -1120,23 +1100,15 @@
-       state->setFillColor(&color);
-       builder->updateStyle(state);
-     }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-     if (args[numArgs-1].isName() &&
- 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-       state->setFillPattern(pattern);
-       builder->updateStyle(state);
-     }
--#else
--    if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
--      state->setFillPattern(pattern);
--      builder->updateStyle(state);
--    }
--#endif
- 
-   } else {
-     if (numArgs != state->getFillColorSpace()->getNComps()) {
--      error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-+      error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-       return;
-     }
-     state->setFillPattern(NULL);
-@@ -1161,7 +1133,7 @@
- 	       ->getUnder() ||
- 	  numArgs - 1 != ((GfxPatternColorSpace *)state->getStrokeColorSpace())
- 	                     ->getUnder()->getNComps()) {
--	error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-+	error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
- 	return;
-       }
-       for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
-@@ -1172,23 +1144,15 @@
-       state->setStrokeColor(&color);
-       builder->updateStyle(state);
-     }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-     if (args[numArgs-1].isName() &&
- 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-       state->setStrokePattern(pattern);
-       builder->updateStyle(state);
-     }
--#else
--    if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
--      state->setStrokePattern(pattern);
--      builder->updateStyle(state);
--    }
--#endif
- 
-   } else {
-     if (numArgs != state->getStrokeColorSpace()->getNComps()) {
--      error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-+      error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-       return;
-     }
-     state->setStrokePattern(NULL);
-@@ -1212,7 +1176,7 @@
- 
- void PdfParser::opLineTo(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in lineto"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in lineto"));
-     return;
-   }
-   state->lineTo(args[0].getNum(), args[1].getNum());
-@@ -1222,7 +1186,7 @@
-   double x1, y1, x2, y2, x3, y3;
- 
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in curveto"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in curveto"));
-     return;
-   }
-   x1 = args[0].getNum();
-@@ -1238,7 +1202,7 @@
-   double x1, y1, x2, y2, x3, y3;
- 
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in curveto1"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in curveto1"));
-     return;
-   }
-   x1 = state->getCurX();
-@@ -1254,7 +1218,7 @@
-   double x1, y1, x2, y2, x3, y3;
- 
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in curveto2"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in curveto2"));
-     return;
-   }
-   x1 = args[0].getNum();
-@@ -1282,7 +1246,7 @@
- 
- void PdfParser::opClosePath(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in closepath"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in closepath"));
-     return;
-   }
-   state->closePath();
-@@ -1298,7 +1262,7 @@
- 
- void PdfParser::opStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1314,7 +1278,7 @@
- 
- void PdfParser::opCloseStroke(Object * /*args[]*/, int /*numArgs*/) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in closepath/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/stroke"));
-     return;
-   }
-   state->closePath();
-@@ -1331,7 +1295,7 @@
- 
- void PdfParser::opFill(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in fill"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in fill"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1347,7 +1311,7 @@
- 
- void PdfParser::opEOFill(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in eofill"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in eofill"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1363,7 +1327,7 @@
- 
- void PdfParser::opFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in fill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in fill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1376,7 +1340,7 @@
- 
- void PdfParser::opCloseFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in closepath/fill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/fill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1388,7 +1352,7 @@
- 
- void PdfParser::opEOFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in eofill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in eofill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1399,7 +1363,7 @@
- 
- void PdfParser::opCloseEOFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in closepath/eofill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/eofill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1440,7 +1404,7 @@
-     doShadingPatternFillFallback((GfxShadingPattern *)pattern, gFalse, eoFill);
-     break;
-   default:
--    error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"),
-+    error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"),
- 	  pattern->getType());
-     break;
-   }
-@@ -1459,7 +1423,7 @@
-     doShadingPatternFillFallback((GfxShadingPattern *)pattern, gTrue, gFalse);
-     break;
-   default:
--    error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"),
-+    error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"),
- 	  pattern->getType());
-     break;
-   }
-@@ -1579,15 +1543,9 @@
-   double *matrix = NULL;
-   GBool savedState = gFalse;
- 
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-   if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
-     return;
-   }
--#else
--  if (!(shading = res->lookupShading(args[0].getName()))) {
--    return;
--  }
--#endif
- 
-   // save current graphics state
-   if (shading->getType() != 2 && shading->getType() != 3) {
-@@ -2156,7 +2114,7 @@
- 
- void PdfParser::opShowText(Object args[], int numArgs) {
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in show"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in show"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2170,7 +2128,7 @@
-   double tx, ty;
- 
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in move/show"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in move/show"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2188,7 +2146,7 @@
-   double tx, ty;
- 
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in move/set/show"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in move/set/show"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2211,7 +2169,7 @@
-   int i;
- 
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in show/space"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in show/space"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2236,7 +2194,7 @@
-     } else if (obj.isString()) {
-       doShowText(obj.getString());
-     } else {
--      error(getPos(), const_cast<char*>("Element of show/space array must be number or string"));
-+      error(errInternal, getPos(), const_cast<char*>("Element of show/space array must be number or string"));
-     }
-     obj.free();
-   }
-@@ -2334,7 +2292,7 @@
- 	if (charProc.isStream()) {
- 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
- 	} else {
--	  error(getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry"));
-+	  error(errInternal, getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry"));
- 	}
- 	//out->endType3Char(state);
- 	if (resDict) {
-@@ -2410,7 +2368,7 @@
-     return;
-   }
-   if (!obj1.isStream()) {
--    error(getPos(), const_cast<char*>("XObject '%s' is wrong type"), name);
-+    error(errInternal, getPos(), const_cast<char*>("XObject '%s' is wrong type"), name);
-     obj1.free();
-     return;
-   }
-@@ -2426,9 +2384,9 @@
- /*    out->psXObject(obj1.getStream(),
-     		   obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/
-   } else if (obj2.isName()) {
--    error(getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName());
-+    error(errInternal, getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName());
-   } else {
--    error(getPos(), const_cast<char*>("XObject subtype is missing or wrong type"));
-+    error(errInternal, getPos(), const_cast<char*>("XObject subtype is missing or wrong type"));
-   }
-   obj2.free();
-   obj1.free();
-@@ -2559,11 +2517,7 @@
-       }
-     }
-     if (!obj1.isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-       colorSpace = GfxColorSpace::parse(&obj1, NULL);
--#else
--      colorSpace = GfxColorSpace::parse(&obj1);
--#endif
-     } else if (csMode == streamCSDeviceGray) {
-       colorSpace = new GfxDeviceGrayColorSpace();
-     } else if (csMode == streamCSDeviceRGB) {
-@@ -2648,11 +2602,7 @@
- 	  obj2.free();
- 	}
-       }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-       maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
--#else
--      maskColorSpace = GfxColorSpace::parse(&obj1);
--#endif
-       obj1.free();
-       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
- 	goto err1;
-@@ -2758,7 +2708,7 @@
-  err2:
-   obj1.free();
-  err1:
--  error(getPos(), const_cast<char*>("Bad image parameters"));
-+  error(errInternal, getPos(), const_cast<char*>("Bad image parameters"));
- }
- 
- void PdfParser::doForm(Object *str) {
-@@ -2783,7 +2733,7 @@
-   // check form type
-   dict->lookup(const_cast<char*>("FormType"), &obj1);
-   if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
--    error(getPos(), const_cast<char*>("Unknown form type"));
-+    error(errInternal, getPos(), const_cast<char*>("Unknown form type"));
-   }
-   obj1.free();
- 
-@@ -2791,7 +2741,7 @@
-   dict->lookup(const_cast<char*>("BBox"), &bboxObj);
-   if (!bboxObj.isArray()) {
-     bboxObj.free();
--    error(getPos(), const_cast<char*>("Bad form bounding box"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad form bounding box"));
-     return;
-   }
-   for (i = 0; i < 4; ++i) {
-@@ -2827,11 +2777,7 @@
-     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
-       transpGroup = gTrue;
-       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
- 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
--#else
--	blendingColorSpace = GfxColorSpace::parse(&obj3);
--#endif
-       }
-       obj3.free();
-       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
-@@ -2990,7 +2936,7 @@
-   parser->getObj(&obj);
-   while (!obj.isCmd(const_cast<char*>("ID")) && !obj.isEOF()) {
-     if (!obj.isName()) {
--      error(getPos(), const_cast<char*>("Inline image dictionary key must be a name object"));
-+      error(errInternal, getPos(), const_cast<char*>("Inline image dictionary key must be a name object"));
-       obj.free();
-     } else {
-       key = copyString(obj.getName());
-@@ -3005,7 +2951,7 @@
-     parser->getObj(&obj);
-   }
-   if (obj.isEOF()) {
--    error(getPos(), const_cast<char*>("End of file in inline image"));
-+    error(errInternal, getPos(), const_cast<char*>("End of file in inline image"));
-     obj.free();
-     dict.free();
-     return NULL;
-@@ -3020,11 +2966,11 @@
- }
- 
- void PdfParser::opImageData(Object args[], int numArgs) {
--  error(getPos(), const_cast<char*>("Internal: got 'ID' operator"));
-+  error(errInternal, getPos(), const_cast<char*>("Internal: got 'ID' operator"));
- }
- 
- void PdfParser::opEndImage(Object args[], int numArgs) {
--  error(getPos(), const_cast<char*>("Internal: got 'EI' operator"));
-+  error(errInternal, getPos(), const_cast<char*>("Internal: got 'EI' operator"));
- }
- 
- //------------------------------------------------------------------------
-diff -Naur old/src/extension/internal/pdfinput/svg-builder.cpp new/src/extension/internal/pdfinput/svg-builder.cpp
---- old/src/extension/internal/pdfinput/svg-builder.cpp	2011-07-08 20:25:09.468790000 +0200
-+++ new/src/extension/internal/pdfinput/svg-builder.cpp	2012-05-13 20:45:22.303804308 +0200
-@@ -961,9 +961,7 @@
-     _font_style = sp_repr_css_attr_new();
-     GfxFont *font = state->getFont();
-     // Store original name
--    if (font->getOrigName()) {
--        _font_specification = font->getOrigName()->getCString();
--    } else if (font->getName()) {
-+    if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-     } else {
-         _font_specification = (char*) "Arial";
diff --git a/staging/irssi/PKGBUILD b/staging/irssi/PKGBUILD
deleted file mode 100644
index e831da8f7..000000000
--- a/staging/irssi/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 159478 2012-05-24 21:17:59Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Dan McGee <dan@archlinux.org>
-
-pkgname=irssi
-pkgver=0.8.15
-pkgrel=6
-pkgdesc="Modular text mode IRC client with Perl scripting"
-arch=('i686' 'x86_64')
-url="http://irssi.org/"
-license=('GPL')
-depends=('glib2' 'openssl')
-optdepends=('perl-libwww: for the scriptassist script')
-backup=('etc/irssi.conf')
-source=("http://irssi.org/files/${pkgname}-${pkgver}.tar.bz2")
-options=('!libtool')
-md5sums=('1dcb3f511b88df94b0c996f36668c7da')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --enable-ipv6 \
-	      --with-proxy \
-	      --sysconfdir=/etc \
-	      --with-perl-lib=vendor
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install 
-}
diff --git a/staging/kdebindings-perlkde/PKGBUILD b/staging/kdebindings-perlkde/PKGBUILD
deleted file mode 100644
index 6d6eee696..000000000
--- a/staging/kdebindings-perlkde/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 159447 2012-05-24 12:36:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlkde
-pkgver=4.8.3
-pkgrel=2
-pkgdesc="Perl bindings for the KDE libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-perlqt' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
-            'kdegraphics-okular' 'kdesdk-kate')
-source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz")
-sha1sums=('bfc1c3a86789832cf7747dfc854d586d86c10a99')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../perlkde-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-perlqt/PKGBUILD b/staging/kdebindings-perlqt/PKGBUILD
deleted file mode 100644
index a51438507..000000000
--- a/staging/kdebindings-perlqt/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 159445 2012-05-24 12:35:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlqt
-pkgver=4.8.3
-pkgrel=2
-pkgdesc="Perl bindings for the Qt libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt' 'perl-list-moreutils')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz")
-sha1sums=('d0d0d5da1fd9c50bd19ff2bb49d6a71a2d97759f')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../perlqt-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-okular/PKGBUILD b/staging/kdegraphics-okular/PKGBUILD
deleted file mode 100644
index ac50aeb7b..000000000
--- a/staging/kdegraphics-okular/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 158978 2012-05-13 22:30:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-okular
-pkgver=4.8.3
-pkgrel=2
-pkgdesc='Document Viewer'
-arch=('i686' 'x86_64')
-url="http://kde.org/applications/graphics/okular/"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
-         'ebook-tools' 'libspectre')
-makedepends=('cmake' 'automoc4')
-optdepends=('kdegraphics-mobipocket: mobipocket support')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz")
-sha1sums=('7c43076df3e9d6217e2a5cbb8ef6d8af89f8ae37')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../okular-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-okular/kdegraphics-okular.install b/staging/kdegraphics-okular/kdegraphics-okular.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-okular/kdegraphics-okular.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/libatasmart/PKGBUILD b/staging/libatasmart/PKGBUILD
deleted file mode 100644
index 7981b0536..000000000
--- a/staging/libatasmart/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 159755 2012-05-26 15:06:57Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libatasmart
-pkgver=0.18
-pkgrel=2
-pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('udev')
-url="http://0pointer.de/blog/projects/being-smart.html"
-options=('!libtool')
-source=("http://0pointer.de/public/${pkgname}-${pkgver}.tar.gz")
-md5sums=('dc22b7acda1c2230f55ae98737e8b159')
-
-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/staging/libmp4v2/PKGBUILD b/staging/libmp4v2/PKGBUILD
deleted file mode 100644
index 79b1214a7..000000000
--- a/staging/libmp4v2/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 159342 2012-05-21 22:25:00Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libmp4v2
-pkgver=2.0.0
-pkgrel=1
-pkgdesc="MPEG-4 library"
-arch=('i686' 'x86_64')
-license=('MPL')
-url="http://code.google.com/p/mp4v2/"
-depends=('gcc-libs')
-options=('!libtool')
-source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2")
-
-build() {
-  cd ${srcdir}/mp4v2-${pkgver}
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/mp4v2-${pkgver}
-  make DESTDIR=${pkgdir} install
-  make DESTDIR=${pkgdir} install-man
-}
-md5sums=('c91f06711225b34b4c192c9114887b14')
diff --git a/staging/libreoffice/PKGBUILD b/staging/libreoffice/PKGBUILD
deleted file mode 100644
index ec862da00..000000000
--- a/staging/libreoffice/PKGBUILD
+++ /dev/null
@@ -1,707 +0,0 @@
-# $Id: PKGBUILD 159255 2012-05-19 19:04:53Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	'libreoffice-postgresql-connector'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-	'libreoffice-scripting-beanshell'
-	'libreoffice-scripting-javascript'
-	'libreoffice-extension-scripting-python') # svn up -r 142692 (last one with all extensions built
-_LOver=3.5.3.2
-pkgver=3.5.3
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost'
-             'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit'
-             'beanshell'  'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs'
-              #'saxon' - currently broken 
-             # the runtime dependencies
-             "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
-             'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
-	         'ttf-dejavu') # to satisfy regression tests
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
-	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	${_additional_source_url}/2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
-	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
-	${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
-	http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e
-	smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810
-	poppler_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ac68934592ec7d838cf5c22744be8d97aa4a1a47
-	fix_broken_hebrew_wordwrapping.diff
-	buildfix_icu49.diff
-	libreoffice-common.sh libreoffice-common.csh)
-noextract=(2fa6028324347860e684e75310818d43-libvisio-0.0.16.tar.bz2
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
-	ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
-	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
-	e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
-	7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
-	2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('d22cd79e7463ac4caf0a4b47d78a82ac'
-         '3455f3f523d739aa391b5a5bf04ff958'
-         '945fbf7888c464f4e1cf7282d370b257'
-         '18f577b374d60b3c760a3a3350407632'
-         '2fa6028324347860e684e75310818d43'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         'e1c178b18f130b40494561f02bc1a948'
-         '7c2549f6b0a8bb604e6c4c729ffdcfe6'
-         '185d60944ea767075d27247c3162b3bc'
-         '60ce5dc9bd098f95c2e621a930c98dd9'
-         '661a52a02a31b3afbe4b3b3146061afd'
-         '72ba8d57cefdc25a6f1bc845edfd4d78'
-         '025d9b17d9eb90dc282c5c1289a666aa'
-         '9734ea20c9f67e1b6e1c5a1247fbd3ff'
-         'f0e72d0e1bc93a50a3aa9d31350b156c'
-         '867c682b45f477f916786e00c45d7ab7')
-
-build() {
-
-	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
-	[ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
-	[ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-        cd ${srcdir}/libreoffice-core-$_LOver
-
-	# move external sources into place
-	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
-	for source in "${noextract[@]}"; do
-	  ln -s ${srcdir}/$source .
-	done
-	popd
-	
-	ln -s ../libreoffice-help-$_LOver/helpcontent2 .
-	ln -s ../libreoffice-translations-$_LOver/translations .
-
-	# buildfixes & bugfixes
-	# one late fix to solve make distro-pack-install issue
-	patch -Np1 -i ${srcdir}/gmake_install.diff
-	patch -Np1 -i ${srcdir}/smp_buildfix.diff
-	#patch -Np0 -i ${srcdir}/buildfix_icu49.diff
-	patch -Np1 -i ${srcdir}/poppler_buildfix.diff
-	# https://bugs.archlinux.org/task/29854 based on 3.6/master patch http://cgit.freedesktop.org/libreoffice/core/patch/?id=20c24114143d6d38774b56a142fd4ae05094308e
-	patch -Np1 -i ${srcdir}/fix_broken_hebrew_wordwrapping.diff
-	
-	# unset C(XX)FLAGS
-	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
-#	unset CFLAGS
-#	unset CXXFLAGS
-
-	#use the CFLAGS but remove the LibO overridden ones
-	for i in $CFLAGS; do
-		case "$i" in
-			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
-		esac
-        ARCH_FLAGS="$ARCH_FLAGS $i"
-	done
-	
-	# python2 fix
-	export PYTHON=python2
-
-#	autoconf -f
-
-	# non-SMP test build
-#	export MAKEFLAGS="-j1"
-	#./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-#	touch autogen.lastrun
-	./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
-		--with-unix-wrapper="libreoffice" \
-		--enable-split-app-modules \
-		--with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--disable-fetch-external \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--libdir=/usr/lib --mandir=/usr/share/man \
-		--disable-verbose \
-		--with-lang="" \
-		--enable-crashdump \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--disable-gnome-vfs\
-		--disable-kde\
-		--enable-kde4\
-		--enable-gtk3 \
-		--enable-lockdown\
-		--enable-mergelibs \
-		--enable-opengl \
-		--enable-odk\
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-librsvg=system \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--without-system-libvisio \
-		--without-system-libcmis \
-		--without-system-sampleicc \
-		--without-system-libexttextcat \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-beanshell \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--without-system-saxon\
-		--disable-mozilla \
-		--without-system-mozilla \
-		--without-system-mozilla-headers \
-		--with-ant-home="/usr/share/java/apache-ant"\
-		--with-system-boost\
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mythes\
-		--with-system-headers\
-		--with-system-hsqldb \
-		--with-alloc=system\
-		--with-system-lucene\
-		--with-lucene-core-jar=/usr/share/java/lucene-core.jar\
-		--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS
-
-#		--disable-ext-lightproof \
-
-
-#--with-install-dirname="${pkgbase}" 
-#		--enable-cairo\
-#		--with-system-libtextcat \
-#		--with-external-libtextcat-data \
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-#--with-servlet-api-jar=JARFILE 
-# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
-#		--with-system-saxon\
-#		--with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-
-	touch src.downloaded
-	#./download
-	make
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
-}
-
-#check() {
-#	cd ${srcdir}/build
-#	make check
-#}
-
-package_libreoffice-common() {
-
- pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
-          #'saxon'
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'libcups:          adds printing support'
-             'gconf:            adds additional gnome support'
-             'nss:              adds support for signed files/macros'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'poppler:          for shipped pdfimport extension'
-             'libmythes:        for use in thesaurus'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'lucene:           full-text search engine library for Java needed in the help section'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
- 
- # set python-uno PYTHON path
- install -dm755 ${pkgdir}/etc/profile.d
- install -m644 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
- 
- # move bash-completion files to its new place
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
- rm -rf ${pkgdir}/etc/bash_completion.d
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
- install=libreoffice-base.install
- depends=('libreoffice-common' 'hsqldb-java')
- optdepends=('libreoffice-postgresql-connector')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-postgresql-connector() {
- pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
- depends=('libreoffice-base' 'postgresql-libs')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # no file-list so far
- install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry
- 
-# # create directories from *list.txt file
-# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-#   install -dm755 ${pkgdir}/${directory/\%dir/}
-# done
-# # install files into the pkg from fakeinstall dir
-# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-#   dirname=`dirname $file`
-#   # check if directory has been already been created - some are missing like manpages
-#   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-#   # mv file from fakeinstall to pkgdir
-#   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
-# done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- install=libreoffice-calc.install
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- install=libreoffice-draw.install
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gtk2' 'gtk3') #'dbus-glib'
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- install=libreoffice-impress.install
- depends=('libreoffice-common')
- optdepends=('mesa:             for the OGLTrans extension')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- 
-  # fix environment path to keep compatibility with openjdk6 and openjdk7
-  #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:"          /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
- groups=('libreoffice')
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
- install=libreoffice-writer.install
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-pdfimport() {
-
- pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice-common' 'poppler')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
-}
-
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
-
-package_libreoffice-scripting-beanshell() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services}
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-scripting-javascript() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/program/{classes,services}
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python2')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
diff --git a/staging/libreoffice/buildfix_icu49.diff b/staging/libreoffice/buildfix_icu49.diff
deleted file mode 100644
index 7a774dee0..000000000
--- a/staging/libreoffice/buildfix_icu49.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=410307
-
---- i18npool/source/breakiterator/data/char_in.txt
-+++ i18npool/source/breakiterator/data/char_in.txt
-@@ -15,7 +15,7 @@
- $CR          = [\p{Grapheme_Cluster_Break = CR}];
- $LF          = [\p{Grapheme_Cluster_Break = LF}];
- $Control     = [\p{Grapheme_Cluster_Break = Control}];
--$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
-+# $Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
- $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
- $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1];
-@@ -72,7 +72,7 @@
- [^$Control $CR $LF] $Extend;
- 
- [^$Control $CR $LF] $SpacingMark;
--$Prepend [^$Control $CR $LF];
-+# $Prepend [^$Control $CR $LF];
- 
- 
- ## -------------------------------------------------
-@@ -94,7 +94,7 @@
- 
- $Extend      [^$Control $CR $LF];
- $SpacingMark [^$Control $CR $LF];
--[^$Control $CR $LF] $Prepend;
-+# [^$Control $CR $LF] $Prepend;
- 
- 
- ## -------------------------------------------------
---- i18npool/source/breakiterator/data/char.txt
-+++ i18npool/source/breakiterator/data/char.txt
-@@ -16,7 +16,7 @@
- $CR          = [\p{Grapheme_Cluster_Break = CR}];
- $LF          = [\p{Grapheme_Cluster_Break = LF}];
- $Control     = [\p{Grapheme_Cluster_Break = Control}];
--$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
-+# $Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
- $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
- # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data
diff --git a/staging/libreoffice/fix_broken_hebrew_wordwrapping.diff b/staging/libreoffice/fix_broken_hebrew_wordwrapping.diff
deleted file mode 100644
index ba4850c77..000000000
--- a/staging/libreoffice/fix_broken_hebrew_wordwrapping.diff
+++ /dev/null
@@ -1,360 +0,0 @@
-From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Sun, 13 May 2012 21:41:30 +0000
-Subject: Resolves: fdo#49849 implement Unicode 6.1 hebrew line breaking rules
-
-i.e.  sync with svn diff -c 31071
-http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt
-
-Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6
----
-diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
-index 14051d4..ffd590c 100644
---- a/i18npool/qa/cppunit/test_breakiterator.cxx
-+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
-@@ -42,6 +42,7 @@
- #include <unotest/bootstrapfixturebase.hxx>
- 
- #include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
- 
- #include <string.h>
- 
-@@ -58,6 +59,9 @@ public:
-     void testWeak();
-     void testAsian();
-     void testThai();
-+#if TODO
-+    void testNorthernThai();
-+#endif
- 
-     CPPUNIT_TEST_SUITE(TestBreakIterator);
-     CPPUNIT_TEST(testLineBreaking);
-@@ -71,6 +71,9 @@
-     CPPUNIT_TEST(testWeak);
-     CPPUNIT_TEST(testAsian);
-     CPPUNIT_TEST(testThai);
-+#if TODO
-+    CPPUNIT_TEST(testNorthernThai);
-+#endif
-     CPPUNIT_TEST_SUITE_END();
- 
- private:
-@@ -80,28 +83,46 @@
-     uno::Reference<i18n::XBreakIterator> m_xBreak;
- };
- 
--//See https://bugs.freedesktop.org/show_bug.cgi?id=31271 for motivation
- void TestBreakIterator::testLineBreaking()
- {
--    ::rtl::OUString aTest1(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
--
-     i18n::LineBreakHyphenationOptions aHyphOptions;
-     i18n::LineBreakUserOptions aUserOptions;
-     lang::Locale aLocale;
- 
--    aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
--    aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
--
-+    //See https://bugs.freedesktop.org/show_bug.cgi?id=31271
-     {
--        //Here we want the line break to leave text here) on the next line
--        i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions);
--        CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6);
-+         ::rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
-+
-+        aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
-+        aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
-+
-+        {
-+            //Here we want the line break to leave text here) on the next line
-+            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions);
-+            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6);
-+        }
-+
-+        {
-+            //Here we want the line break to leave "here)" on the next line
-+            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions);
-+            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11);
-+        }
-     }
- 
-+    //See https://bugs.freedesktop.org/show_bug.cgi?id=49849
-     {
--        //Here we want the line break to leave "here)" on the next line
--        i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions);
--        CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11);
-+        const sal_Unicode HEBREW1[] = { 0x05DE, 0x05D9, 0x05DC, 0x05D9, 0x5DD };
-+        ::rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1));
-+        ::rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear());
-+
-+        aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he"));
-+        aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IL"));
-+
-+        {
-+            //Here we want the line break to happen at the whitespace
-+            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, aTest.getLength()-1, aLocale, 0, aHyphOptions, aUserOptions);
-+            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == aWord.getLength()+1);
-+        }
-     }
- }
- 
-@@ -295,27 +320,29 @@ void TestBreakIterator::testThai()
-     aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th"));
-     aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
- 
--    i18n::Boundary aBounds;
--    {
--        const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
--        ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
--        aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
--            i18n::WordType::DICTIONARY_WORD, true);
--        CPPUNIT_ASSERT_MESSAGE("Should skip full word",
--            aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
--    }
-+    const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
-+    ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
-+    i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
-+        i18n::WordType::DICTIONARY_WORD, true);
-+    CPPUNIT_ASSERT_MESSAGE("Should skip full word",
-+        aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
-+}
- 
--#ifdef TODO
--    {
--        const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
--        ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
--        aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
--            i18n::WordType::DICTIONARY_WORD, true);
--        CPPUNIT_ASSERT_MESSAGE("Should skip full word",
--            aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
--    }
--#endif
-+#if TODO
-+void TestBreakIterator::testNorthernThai()
-+{
-+    lang::Locale aLocale;
-+    aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nod"));
-+    aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
-+
-+    const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
-+    ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
-+    i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
-+        i18n::WordType::DICTIONARY_WORD, true);
-+    CPPUNIT_ASSERT_MESSAGE("Should skip full word",
-+        aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
- }
-+#endif
- 
- void TestBreakIterator::setUp()
- {
-diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README
-new file mode 100644
-index 0000000..8d7598d
---- a/dev/null
-+++ b/i18npool/source/breakiterator/data/README
-@@ -0,0 +1,12 @@
-+The originals of these come from svn checkout
-+http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr they no
-+longer appear in the icu tarballs, but are in icu's svn
-+
-+At various stages these copies have been customized and are not horribly out of
-+sync. It unclear which diffs from the base versions are deliberate and which
-+are now accidental :-(
-+
-+We need to review the various issues referenced in the commits that caused
-+custimizations and see if they're still relevant or not, write regression tests
-+for them, if any are still relavant then apply the changes back on top of the
-+latest versions.
-diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt
-index cbabee6..91c8f3d 100644
---- a/i18npool/source/breakiterator/data/line.txt
-+++ b/i18npool/source/breakiterator/data/line.txt
-@@ -61,11 +61,13 @@ $BB = [:LineBreak =  Break_Before:];
- $BK = [:LineBreak =  Mandatory_Break:];
- $B2 = [:LineBreak =  Break_Both:];
- $CB = [:LineBreak =  Contingent_Break:];
-+$CJ = [:LineBreak =  Conditional_Japanese_Starter:];
- $CL = [:LineBreak =  Close_Punctuation:] ;
- $CM = [:LineBreak =  Combining_Mark:];
- $CR = [:LineBreak =  Carriage_Return:];
- $EX = [:LineBreak =  Exclamation:];
- $GL = [:LineBreak =  Glue:];
-+$HL = [:LineBreak =  Hebrew_Letter:];
- $HY = [:LineBreak =  Hyphen:];
- $H2 = [:LineBreak =  H2:];
- $H3 = [:LineBreak =  H3:];
-@@ -77,7 +79,7 @@ $JV = [:LineBreak =  JV:];
- $JT = [:LineBreak =  JT:];
- $LF = [:LineBreak =  Line_Feed:];
- $NL = [:LineBreak =  Next_Line:];
--$NS = [:LineBreak =  Nonstarter:];
-+$NS = [[:LineBreak =  Nonstarter:] $CJ];
- $NU = [:LineBreak =  Numeric:];
- $OP = [[:LineBreak =  Open_Punctuation:] - $DG];
- $PO = [:LineBreak =  Postfix_Numeric:];
-@@ -118,6 +120,7 @@ $B2cm = $B2 $CM*;
- $CLcm = $CL $CM*;
- $EXcm = $EX $CM*;
- $GLcm = $GL $CM*;
-+$HLcm = $HL $CM*;
- $HYcm = $HY $CM*;
- $H2cm = $H2 $CM*;
- $H3cm = $H3 $CM*;
-@@ -150,6 +153,7 @@ $B2 $CM+;
- $CL $CM+;
- $EX $CM+;
- $GL $CM+;
-+$HL $CM+;
- $HY $CM+;
- $H2 $CM+;
- $H3 $CM+;
-@@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM];       # Bases that can't take CMs
- #            so for this one case we need to manually list out longer sequences.
- #
- $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP];
--$AL_FOLLOW_CM   = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
-+$AL_FOLLOW_CM   = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
- $AL_FOLLOW      = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM];
- 
- 
-@@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm);
- $BBcm [^$CB];                                  #  $BB  x
- $BBcm $LB20NonBreaks $CM*;
- 
-+# LB 21a Don't break after Hebrew + Hyphen
-+#   HL (HY | BA) x
-+#  
-+$HLcm ($HYcm | $BAcm) [^$CB]?;
-+
- # LB 22
--$ALcm    $INcm;
-+($ALcm | $HLcm) $INcm;
- $CM+     $INcm;     #  by rule 10, any otherwise unattached CM behaves as AL
- $IDcm    $INcm;
- $INcm    $INcm;
-@@ -331,16 +340,18 @@ $NUcm    $INcm;
- # $LB 23
- $IDcm  $POcm;
- $ALcm  $NUcm;       # includes $LB19
-+$HLcm  $NUcm;
- $CM+   $NUcm;       # Rule 10, any otherwise unattached CM behaves as AL
- $NUcm  $ALcm;
-+$NUcm  $HLcm;
- 
- #
- # LB 24
- #
- $PRcm $IDcm;
- $ALcm $PRcm;
--$PRcm $ALcm;
--$POcm $ALcm;
-+$PRcm ($ALcm | $HLcm);
-+$POcm ($ALcm | $HLcm);
- 
- #
- # LB 25   Numbers.
-@@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm);
- 
- # LB 28   Do not break between alphabetics
- #
--$ALcm $ALcm;
--$CM+ $ALcm;      # The $CM+ is from rule 10, and unattached CM is treated as AL
-+($ALcm | $HLcm) ($ALcm | $HLcm);
-+$CM+ ($ALcm | $HLcm);      # The $CM+ is from rule 10, an unattached CM is treated as AL
- 
- # LB 29
- $IScm ($ALcm | $NUcm);
-@@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm);
- # Rule 30   Do not break between letters, numbers or ordinary symbols
- #           and opening or closing punctuation
- #
--($ALcm | $NUcm) $OPcm;
-+($ALcm | $HLcm | $NUcm) $OPcm;
- $CM+ $OPcm;
--$CLcm ($ALcm | $NUcm);
--
--
-+$CLcm ($ALcm | $HLcm | $NUcm);
- 
- #
- #  Reverse Rules.
-@@ -391,6 +400,7 @@ $CM+ $B2;
- $CM+ $CL;
- $CM+ $EX;
- $CM+ $GL;
-+$CM+ $HL;
- $CM+ $HY;
- $CM+ $H2;
- $CM+ $H3;
-@@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM];     #  . x (BA | HY | NS)
- $CM* [$LB20NonBreaks-$CM] $CM* $BB;                   #  BB x .
- [^$CB] $CM* $BB;                                      # 
- 
--
-+# LB21a
-+[^$CB] $CM* ($HY | $BA) $CM* $HL;
- 
- # LB 22
--$CM* $IN $CM* $ALPlus;
-+$CM* $IN $CM* ($ALPlus | $HL);
- $CM* $IN $CM* $ID;
- $CM* $IN $CM* $IN;
- $CM* $IN $CM* $NU;
- 
- # LB 23
- $CM* $PO $CM* $ID;
--$CM* $NU $CM* $ALPlus;
--$CM* $ALPlus $CM* $NU;
-+$CM* $NU $CM* ($ALPlus | $HL);
-+$CM* ($ALPlus | $HL) $CM* $NU;
- 
- # LB 24
- $CM* $ID $CM* $PR;
- $CM* $PR $CM* $ALPlus;
--$CM* $ALPlus $CM* $PR;
--$CM* $ALPlus $CM* $PO;
-+$CM* ($ALPlus | $HL) $CM* $PR;
-+$CM* ($ALPlus | $HL) $CM* $PO;
- 
- $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP;
- $CM* $NU+ $CM* $HY+ / $SP;
-@@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL);
- $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR;
- 
- # LB 28
--$CM* $ALPlus $CM* $ALPlus;
--
-+$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL);
- 
- # LB 29
- $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP];
- 
- # LB 30
--$CM* $OP $CM* ($NU | $ALPlus);
--$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP];
-+$CM* $OP $CM* ($ALPlus | $HL | $NU);
-+$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP];
- 
- 
- ## -------------------------------------------------
-@@ -609,6 +619,9 @@ $SP+ $CM* $QU;
- $SP+ $CM* $CL;
- $SP+ $CM* $B2;
- 
-+# LB 21
-+$CM* ($HY | $BA) $CM* $HL;
-+
- # LB 18
- ($CM* ($IS | $SY))+ $CM* $NU;
- $CL $CM* ($NU | $IS | $SY);
-@@ -629,6 +642,6 @@ $dictionary $dictionary;
- #  turn off rule chaining.  We don't want to move more
- #  than necessary.
- #
--[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary];
-+[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary];
- $dictionary $dictionary;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/libreoffice/libreoffice-base.install b/staging/libreoffice/libreoffice-base.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/staging/libreoffice/libreoffice-base.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/staging/libreoffice/libreoffice-calc.install b/staging/libreoffice/libreoffice-calc.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/staging/libreoffice/libreoffice-calc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/staging/libreoffice/libreoffice-common.csh b/staging/libreoffice/libreoffice-common.csh
deleted file mode 100644
index af31d4432..000000000
--- a/staging/libreoffice/libreoffice-common.csh
+++ /dev/null
@@ -1 +0,0 @@
-#setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program
diff --git a/staging/libreoffice/libreoffice-common.install b/staging/libreoffice/libreoffice-common.install
deleted file mode 100644
index e66b66f3d..000000000
--- a/staging/libreoffice/libreoffice-common.install
+++ /dev/null
@@ -1,47 +0,0 @@
-post_install() {
-
-xdg-icon-resource forceupdate --theme hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
-
-echo " * see https://wiki.archlinux.org/index.php/LibreOffice"
-echo "-------------------------------------------------------------------"
-echo "LibreOffice has been split into several packages:"
-echo "- libreoffice-common"
-echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
-echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-echo "                              the LibreOffice APIs and for creating"
-echo "                              extensions (UNO components)."
-echo "-------------------------------------------------------------------"
-echo " * you need to install at least one libreoffice-langpack"
-echo " * you may want to pacman -Ss libreoffice-extensions"
-echo "   to see what additional extensions are prepared to install"
-echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg
-         for spell checking"
-echo " * make sure you have installed some ttf font (ttf-dejavu recommended)"
-}
-
-post_upgrade() {
-#  post_install $1
-xdg-icon-resource forceupdate --theme hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
-  if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then
-    # important upgrade notice
-    echo "LibreOffice has been split into several packages:"
-    echo "- libreoffice-common"
-    echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
-    echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-    echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-    echo "                              the LibreOffice APIs and for creating"
-    echo "                              extensions (UNO components)."
-    echo "Now you need to install at least one libreoffice-langpack!"
-  fi
-}
-
-post_remove() {
-update-desktop-database -q
-xdg-icon-resource forceupdate --theme hicolor
-update-mime-database usr/share/mime > /dev/null 2>&1
-}
diff --git a/staging/libreoffice/libreoffice-common.sh b/staging/libreoffice/libreoffice-common.sh
deleted file mode 100644
index ee405b1aa..000000000
--- a/staging/libreoffice/libreoffice-common.sh
+++ /dev/null
@@ -1 +0,0 @@
-#export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program"
diff --git a/staging/libreoffice/libreoffice-draw.install b/staging/libreoffice/libreoffice-draw.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/staging/libreoffice/libreoffice-draw.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/staging/libreoffice/libreoffice-impress.install b/staging/libreoffice/libreoffice-impress.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/staging/libreoffice/libreoffice-impress.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/staging/libreoffice/libreoffice-writer.install b/staging/libreoffice/libreoffice-writer.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/staging/libreoffice/libreoffice-writer.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/staging/libreoffice/libreoffice.install b/staging/libreoffice/libreoffice.install
deleted file mode 100644
index e66b66f3d..000000000
--- a/staging/libreoffice/libreoffice.install
+++ /dev/null
@@ -1,47 +0,0 @@
-post_install() {
-
-xdg-icon-resource forceupdate --theme hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
-
-echo " * see https://wiki.archlinux.org/index.php/LibreOffice"
-echo "-------------------------------------------------------------------"
-echo "LibreOffice has been split into several packages:"
-echo "- libreoffice-common"
-echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
-echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-echo "                              the LibreOffice APIs and for creating"
-echo "                              extensions (UNO components)."
-echo "-------------------------------------------------------------------"
-echo " * you need to install at least one libreoffice-langpack"
-echo " * you may want to pacman -Ss libreoffice-extensions"
-echo "   to see what additional extensions are prepared to install"
-echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg
-         for spell checking"
-echo " * make sure you have installed some ttf font (ttf-dejavu recommended)"
-}
-
-post_upgrade() {
-#  post_install $1
-xdg-icon-resource forceupdate --theme hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
-  if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then
-    # important upgrade notice
-    echo "LibreOffice has been split into several packages:"
-    echo "- libreoffice-common"
-    echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
-    echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-    echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-    echo "                              the LibreOffice APIs and for creating"
-    echo "                              extensions (UNO components)."
-    echo "Now you need to install at least one libreoffice-langpack!"
-  fi
-}
-
-post_remove() {
-update-desktop-database -q
-xdg-icon-resource forceupdate --theme hicolor
-update-mime-database usr/share/mime > /dev/null 2>&1
-}
diff --git a/staging/lvm2/11-dm-initramfs.rules b/staging/lvm2/11-dm-initramfs.rules
deleted file mode 100644
index d2c167324..000000000
--- a/staging/lvm2/11-dm-initramfs.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-# needed with new udev/mkinitcpio and as implemented in dracut:
-# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
-SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
diff --git a/staging/lvm2/PKGBUILD b/staging/lvm2/PKGBUILD
deleted file mode 100644
index 496a40266..000000000
--- a/staging/lvm2/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 159668 2012-05-26 01:03:13Z dreisner $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgbase=lvm2
-pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.95
-pkgrel=6
-arch=('i686' 'x86_64')
-url="http://sourceware.org/lvm2/"
-license=('GPL2' 'LGPL2.1')
-groups=('base')
-source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
-        lvm2_install
-        lvm2_hook
-        11-dm-initramfs.rules)
-sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85'
-          '45f5e31045065e7bdf5d6f2e21c857b4978024b4'
-          '3e1680f9b76ce9150d08865d99db90fd15532271'
-          'cedc9948123c870f9c5aa3357d0075b41a9c8135'
-          'f6a554eea9557c3c236df2943bb6e7e723945c41')
-
-build() {
-  cd "${srcdir}/LVM2.${pkgver}"
-  unset LDFLAGS
-
-  # libudev.so.1.0.0 compat
-  sed -i 's,udev_get_dev_path([^)]\+),"/dev",' \
-      tools/dmsetup.c \
-      lib/misc/lvm-wrappers.c
-
-  ./configure --prefix=/ --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
-    --includedir=/usr/include --with-usrlibdir=/usr/lib  --libdir=/usr/lib --with-udev-prefix=/usr \
-    --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
-    --enable-udev_sync --enable-udev_rules
-  make
-}
-
-package_device-mapper() {
-  pkgdesc="Device mapper userspace library and tools"
-  url="http://sourceware.org/dm/"
-  depends=('glibc' 'udev')
-
-  cd "${srcdir}/LVM2.${pkgver}"
-  make DESTDIR="${pkgdir}" install_device-mapper
-  # extra udev rule for device-mapper in initramfs
-  install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
-}
-
-package_lvm2() {
-  pkgdesc="Logical Volume Manager 2 utilities"
-  depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
-  conflicts=('lvm' 'mkinitcpio<0.7')
-  backup=('etc/lvm/lvm.conf')
-  options=('!makeflags')
-
-  cd "${srcdir}/LVM2.${pkgver}"
-  make DESTDIR="${pkgdir}" install_lvm2
-  # install applib
-  make -C liblvm DESTDIR="${pkgdir}" install
-  # /etc directories
-  install -d "${pkgdir}"/etc/lvm/{archive,backup}
-  # mkinitcpio hook
-  install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
-  install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
-}
diff --git a/staging/lvm2/lvm2_hook b/staging/lvm2/lvm2_hook
deleted file mode 100644
index e69b3349a..000000000
--- a/staging/lvm2/lvm2_hook
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-    local pvdev
-
-    modprobe -q dm-mod >/dev/null 2>&1
-
-    # If the lvmwait= parameter has been specified on the command line
-    # wait for the device(s) before trying to activate the volume group(s)
-    for pvdev in ${lvmwait//,/ }; do
-        poll_device ${pvdev} ${rootdelay}
-    done
-
-    msg "Activating logical volumes..."
-    [ -d /etc/lvm ] && lvm vgscan
-
-    if [ -n "$quiet" ]; then
-      lvm vgchange --sysinit -a y >/dev/null
-    else
-      lvm vgchange --sysinit -a y
-    fi
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/staging/lvm2/lvm2_install b/staging/lvm2/lvm2_install
deleted file mode 100644
index 145ce49b2..000000000
--- a/staging/lvm2/lvm2_install
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-build() {
-    local mod
-    for mod in dm-mod dm-snapshot dm-mirror; do
-        add_module "$mod"
-    done
-
-    add_binary "/sbin/lvm"
-    add_binary "/sbin/dmsetup"
-    add_file "/usr/lib/udev/rules.d/10-dm.rules"
-    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
-    add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
-    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
-
-    add_runscript
-}
-
-help() {
-  cat <<HELPEOF
-This hook loads the necessary modules for an LVM2 root device.
-
-The optional lvmwait= parameter followed by a comma-separated
-list of device names can be given on the command line.
-It will cause the hook to wait until all given devices exist
-before trying to scan and activate any volume groups.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/staging/mesa/LICENSE b/staging/mesa/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/staging/mesa/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors.  See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
-
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
-
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
-                  include/GL/glxext.h
-
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
-
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
-
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
-
-demo programs     progs/demos/           various             see source files
-
-X demos           progs/xdemos/          Brian Paul          see source files
-
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
diff --git a/staging/mesa/PKGBUILD b/staging/mesa/PKGBUILD
deleted file mode 100644
index 7bcb4ad10..000000000
--- a/staging/mesa/PKGBUILD
+++ /dev/null
@@ -1,268 +0,0 @@
-# $Id: PKGBUILD 159718 2012-05-26 09:28:14Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=mesa
-pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
-
-#_git=true
-_gitdate=20111031
-_git=false
-
-if [ "${_git}" = "true" ]; then
-    pkgver=7.10.99.git20110709
-    #pkgver=7.11
-  else
-    pkgver=8.0.3
-fi
-pkgrel=2
-arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 
-             'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-source=(LICENSE
-        mesa-8.0.3-llvm-3.1-fixes.patch)
-if [ "${_git}" = "true" ]; then
-	# mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
-	#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
-	source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
-  else
-	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
-	#source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2"
-	#source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2"
-)
-fi
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         'c452ed3392468170726c004c2f4e02ca'
-         'cc5ee15e306b8c15da6a478923797171')
-
-build() {
-    cd ${srcdir}/?esa-*
-
-    patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
-
-if [ "${_git}" = "true" ]; then
-    autoreconf -vfi
-    ./autogen.sh --prefix=/usr \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,svga,swrast \
-    --enable-gallium-llvm \
-   --enable-gallium-egl \
-    --enable-shared-glapi \
-    --enable-gbm \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-glx \
-    --enable-osmesa \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-egl \
-    --enable-texture-float \
-    --enable-xa \
-    --enable-shared-dricore
-    #--enable-gbm \
-    #    --enable-gallium-svga \
-    
-  else
-     autoreconf -vfi
-    ./configure --prefix=/usr \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,nouveau,svga,swrast \
-    --enable-gallium-llvm \
-    --enable-gallium-egl \
-    --enable-shared-glapi \
-    --enable-gbm \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-glx \
-    --enable-osmesa \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-egl \
-    --enable-texture-float \
-    --enable-xa \
-    --enable-shared-dricore
-fi
-
-  make
-}
-
-package_libgl() {
-  depends=('libdrm>=2.4.31' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs')
-  pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
-  #replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri')
-
-  cd ${srcdir}/?esa-*
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
-
-  bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/"
-  bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/"
-  bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/"
-
-  cd src/mesa/drivers/dri
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-
-  ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
-}
-
-package_osmesa() {
-  depends=('mesa')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3D off-screen rendering library"
-  
-  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-osmesa
-}
-
-package_libglapi() {
-  depends=('glibc')
-  pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions"
-
-  cd ${srcdir}/?esa-*   
-  install -m755 -d "${pkgdir}/usr/lib"
-  bin/minstall lib/libglapi.so* "${pkgdir}/usr/lib/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/"
-}
-
-package_libgbm() {
-  depends=('glibc')
-  pkgdesc="Mesa gbm library"
-
-  cd ${srcdir}/?esa-*   
-  install -m755 -d "${pkgdir}/usr/lib"
-  bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/"
-}
-
-package_libgles() {
-  depends=('libglapi' 'khrplatform-devel')
-  pkgdesc="Mesa GLES libraries and headers"
-
-  cd ${srcdir}/?esa-*   
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/include"
-  install -m755 -d "${pkgdir}/usr/include/GLES"
-  install -m755 -d "${pkgdir}/usr/include/GLES2"
-  bin/minstall lib/libGLESv* "${pkgdir}/usr/lib/"
-  bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib/pkgconfig/"
-  bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib/pkgconfig/"
-  bin/minstall include/GLES/* "${pkgdir}/usr/include/GLES/"
-  bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
-  bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
-}
-
-package_libegl() {
-  depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel')
-  pkgdesc="Mesa EGL libraries and headers"
-
-  cd ${srcdir}/?esa-*   
-  make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/include"
-  install -m755 -d "${pkgdir}/usr/include/"
-  install -m755 -d "${pkgdir}/usr/include/EGL"
-  install -m755 -d "${pkgdir}/usr/share"
-  install -m755 -d "${pkgdir}/usr/share/doc"
-  install -m755 -d "${pkgdir}/usr/share/doc/libegl"
-  bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/"
-  install -m755 -d "${pkgdir}/usr/lib/egl"
-  bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/"
-  bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/"
-  bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/"
-  bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
-}
-
-package_khrplatform-devel() {
-  #depends=('')
-  pkgdesc="Khronos platform development package"
-
-  cd ${srcdir}/?esa-*
-  install -m755 -d "${pkgdir}/usr/include/KHR"
-  bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" 
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/"
-}
-
-package_mesa() {
-  depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3-D graphics libraries and include files"
-
-  cd ${srcdir}/?esa-*   
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}/usr/lib/libGL.so"*
-  rm -f "${pkgdir}/usr/lib/libglapi.so"*
-  rm -f "${pkgdir}/usr/lib/libgbm.so"*
-  rm -f "${pkgdir}/usr/lib/libGLESv"*
-  rm -f "${pkgdir}/usr/lib/libEGL"*
-  rm -rf "${pkgdir}/usr/lib/egl"
-  rm -f "${pkgdir}/usr/lib/libOSMesa"*
-  rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc}
-  rm -rf "${pkgdir}/usr/lib/xorg"
-  rm -f "${pkgdir}/usr/include/GL/glew.h"
-  rm -f "${pkgdir}/usr/include/GL/glxew.h"
-  rm -f "${pkgdir}/usr/include/GL/wglew.h"
-  rm -f "${pkgdir}/usr/include/GL/glut.h"
-  rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR}
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
-}
-
-package_ati-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon"
-  conflicts=('xf86-video-ati<6.9.0-6')
-
-  # classic mesa drivers for radeon,r200
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
-  # gallium3D driver for r300,r600
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-}
-
-package_intel-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for Intel"
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
-}
-
-package_nouveau-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
-
-  # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
-  # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-}
-
-package_svga-dri() {
-  depends=("mesa=${pkgver}")
-  pkgdesc="Gallium3D VMware guest GL driver"
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
-}
diff --git a/staging/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/staging/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index a567b5926..000000000
--- a/staging/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
- 
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+   if (!MRI) {
-+      debug_printf("error: no register info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+
-+   OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+   if (!MII) {
-+      debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+   llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-    llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
- 
- 
diff --git a/staging/mod_perl/PKGBUILD b/staging/mod_perl/PKGBUILD
deleted file mode 100644
index 1802ed461..000000000
--- a/staging/mod_perl/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 159775 2012-05-26 19:41:32Z foutrelis $
-# Maintainer:
-# Contributor: Firmicus <francois.archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-
-pkgname=mod_perl
-pkgver=2.0.6
-pkgrel=1
-pkgdesc="Apache module that embeds the Perl interpreter within the server"
-arch=('i686' 'x86_64')
-url="http://perl.apache.org/"
-license=('APACHE')
-depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid')
-options=('!emptydirs')
-source=(http://perl.apache.org/dist/$pkgname-$pkgver.tar.gz
-        mod_perl-2.0.6-nolfs.patch
-        mod_perl-2.0.6-perl-5.16-fixes.patch)
-sha256sums=('8cf768d2c55291e10542ef8d9a4f4ebe835365e43b4584771e654079405827dc'
-            '5d1b6a051d847108b23b5dc06ea5885c37dd81d3a9156b69d179d95b5cf92f08'
-            'c6cde22806b1b2d919545b21c49536c8c377c8d1f921e8948e1289bb2ab413d9')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Patch from openSUSE to fix segfaults on i686 (FS#25008):
-  #   avoid a conflict between apache's LARGEFILE64_SOURCE and perl's
-  #   FILE_OFFSET_BITS=64 because the conflict isn't real and causes the perl
-  #   structures to be invalid if only the apache flags are used
-  patch -Np1 -i "$srcdir/mod_perl-2.0.6-nolfs.patch"
-
-  # Fix build with Perl 5.16
-  # http://search.cpan.org/dist/perl-5.16.0/pod/perldelta.pod#$%3C,_$%3E,_$%28_and_$%29_are_no_longer_cached
-  patch -Np1 -i "$srcdir/mod_perl-2.0.6-perl-5.16-fixes.patch"
-
-  # install module in vendor directories.
-  perl Makefile.PL INSTALLDIRS=vendor MP_APXS=/usr/sbin/apxs
-  make
-}
-
-package() {
-  cd  "$srcdir/$pkgname-$pkgver"
-  make install DESTDIR="$pkgdir"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/mod_perl/mod_perl-2.0.6-nolfs.patch b/staging/mod_perl/mod_perl-2.0.6-nolfs.patch
deleted file mode 100644
index 13e5cccee..000000000
--- a/staging/mod_perl/mod_perl-2.0.6-nolfs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -upr mod_perl-2.0.6.orig/lib/Apache2/Build.pm mod_perl-2.0.6/lib/Apache2/Build.pm
---- mod_perl-2.0.6.orig/lib/Apache2/Build.pm	2012-05-26 22:31:00.000000000 +0300
-+++ mod_perl-2.0.6/lib/Apache2/Build.pm	2012-05-26 22:31:32.000000000 +0300
-@@ -2207,7 +2207,8 @@ sub has_large_files_conflict {
-     # with it is that we didn't have such a case yet, but may need to
-     # deal with it later
- 
--    return $perl_lfs64 ^ $apr_lfs64;
-+    return 0;
-+    # $perl_lfs64 ^ $apr_lfs64;
- }
- 
- # if perl is built with uselargefiles, but apr not, the build won't
diff --git a/staging/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch b/staging/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch
deleted file mode 100644
index 4e26fd87d..000000000
--- a/staging/mod_perl/mod_perl-2.0.6-perl-5.16-fixes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -upr mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c mod_perl-2.0.6/src/modules/perl/modperl_perl.c
---- mod_perl-2.0.6.orig/src/modules/perl/modperl_perl.c	2012-05-26 21:49:27.000000000 +0300
-+++ mod_perl-2.0.6/src/modules/perl/modperl_perl.c	2012-05-26 21:55:39.000000000 +0300
-@@ -102,13 +102,4 @@ static void modperl_perl_init_ids(pTHX_
-     sv_setiv(GvSV(gv_fetchpv("$", TRUE, SVt_PV)), ids->pid);
- 
--#ifndef WIN32
--    PL_uid  = ids->uid;
--    PL_euid = ids->euid;
--    PL_gid  = ids->gid;
--    PL_egid = ids->egid;
--#endif
--#ifdef MP_MAINTAIN_PPID
--    PL_ppid = ids->ppid;
--#endif
- }
- 
diff --git a/staging/net-snmp/PKGBUILD b/staging/net-snmp/PKGBUILD
deleted file mode 100644
index e9930ec14..000000000
--- a/staging/net-snmp/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 159781 2012-05-26 20:12:07Z foutrelis $
-# Maintainer: 
-# Contributor: Dale Blount <dale@archlinux.org>
-
-pkgname=net-snmp
-pkgver=5.7.1
-pkgrel=3
-pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
-arch=('i686' 'x86_64')
-url="http://www.net-snmp.org/"
-license=('BSD')
-depends=('openssl' 'libnl' 'pciutils')
-makedepends=('python2-distribute')
-optdepends=('perl-term-readkey: for snmpcheck application' 
-            'perl-tk: for snmpcheck and tkmib applications'
-            'python2: for the python modules')
-provides=('ucd-snmp')
-backup=('etc/conf.d/snmpd')
-options=('!libtool' '!makeflags' '!emptydirs')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
-        snmpd.confd snmpd.rc libnl32.patch)
-sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a'
-          '2bdc2839ce09d7daa608cd54687fa8beb47ed907'
-          'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b'
-          '90600c0141eed10d6e3ca3ccc97ad8dda15c2112'
-          '74a9848b95f63378eb1753fc309d2b74de5afb0f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
-  patch -Np1 -i "$srcdir/libnl32.patch"
-  autoreconf -f -i
-
-  sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in
-  PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --mandir=/usr/share/man \
-    --enable-ucd-snmp-compatibility \
-    --enable-ipv6 \
-    --with-python-modules \
-    --with-default-snmp-version="3" \
-    --with-sys-contact="root@localhost" \
-    --with-sys-location="Unknown" \
-    --with-logfile="/var/log/snmpd.log" \
-    --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \
-    --with-persistent-directory="/var/net-snmp" \
-    --disable-static
-  make NETSNMP_DONT_CHECK_VERSION=1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install
-  install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
-  install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/net-snmp/libnl32.patch b/staging/net-snmp/libnl32.patch
deleted file mode 100644
index d93d7ef67..000000000
--- a/staging/net-snmp/libnl32.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c
---- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c	2011-09-28 06:53:47.000000000 +0200
-+++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c	2012-02-09 20:02:49.136022132 +0100
-@@ -566,8 +566,9 @@
- static int
- tcpTable_load_netlink(void)
- {
-+	int err;
- 	/*  TODO: perhaps use permanent nl handle? */
--	struct nl_handle *nl = nl_handle_alloc();
-+	struct nl_sock *nl = nl_socket_alloc();
- 
- 	if (nl == NULL) {
- 		DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n"));
-@@ -575,10 +576,10 @@
- 		return -1;
- 	}
- 
--	if (nl_connect(nl, NETLINK_INET_DIAG) < 0) {
--		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror()));
--		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror());
--		nl_handle_destroy(nl);
-+	if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) {
-+		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err)));
-+		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err));
-+		nl_socket_free(nl);
- 		return -1;
- 	}
- 
-@@ -590,10 +591,10 @@
- 	struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST);
- 	nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0);
- 
--	if (nl_send_auto_complete(nl, nm) < 0) {
--		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror()));
--		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror());
--		nl_handle_destroy(nl);
-+	if ((err = nl_send_auto_complete(nl, nm)) < 0) {
-+		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err)));
-+		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err));
-+		nl_socket_free(nl);
- 		return -1;
- 	}
- 	nlmsg_free(nm);
-@@ -604,9 +605,9 @@
- 
- 	while (running) {
- 		if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) {
--			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror()));
--			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror());
--			nl_handle_destroy(nl);
-+			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len)));
-+			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len));
-+			nl_socket_free(nl);
- 			return -1;
- 		}
- 
-@@ -655,7 +656,7 @@
- 		free(buf);
- 	}
- 
--	nl_handle_destroy(nl);
-+	nl_socket_free(nl);
- 
- 	if (tcp_head) {
- 		DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n"));
-diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2 net-snmp-5.7.1-libnl32/configure.d/config_os_libs2
---- net-snmp-5.7.1/configure.d/config_os_libs2	2011-09-28 06:53:47.000000000 +0200
-+++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2	2012-02-09 20:10:44.282165275 +0100
-@@ -224,8 +224,9 @@
- if test "x$with_nl" != "xno"; then
-     case $target_os in
-     linux*) # Check for libnl (linux)
-+	CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)"
- 	NETSNMP_SEARCH_LIBS(
--	    nl_connect, nl,
-+	    nl_connect, nl-3,
- 	    [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS)
-     ;;
-     esac
diff --git a/staging/net-snmp/snmpd.confd b/staging/net-snmp/snmpd.confd
deleted file mode 100644
index 926b09bbf..000000000
--- a/staging/net-snmp/snmpd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters to be passed to snmpd
-#
-SNMPD_ARGS=""
-
diff --git a/staging/net-snmp/snmpd.rc b/staging/net-snmp/snmpd.rc
deleted file mode 100644
index b00c09f4f..000000000
--- a/staging/net-snmp/snmpd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/snmpd
-
-PID=`pidof -o %PPID /usr/sbin/snmpd`
-case "$1" in
-  start)
-    stat_busy "Starting Net-SNMP"
-    [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/snmpd.pid
-      add_daemon snmpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Net-SNMP"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/snmpd.pid
-      rm_daemon snmpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/staging/pango-perl/PKGBUILD b/staging/pango-perl/PKGBUILD
deleted file mode 100644
index 64805ec07..000000000
--- a/staging/pango-perl/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 159745 2012-05-26 12:16:38Z bluewind $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pango-perl
-pkgver=1.223
-pkgrel=2
-pkgdesc="Perl bindings for Pango"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://gtk2-perl.sourceforge.net/"
-makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-depends=('pango' 'glib-perl' 'cairo-perl')
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Pango-${pkgver}.tar.gz)
-md5sums=('628a6de54f47b6791c6b45edfb835215')
-
-build() {
-  cd "${srcdir}/Pango-${pkgver}"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/Pango-${pkgver}"
-  make test
-}
-
-package() { 
-  cd "${srcdir}/Pango-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-}
diff --git a/staging/pciutils/PKGBUILD b/staging/pciutils/PKGBUILD
deleted file mode 100644
index 8458d7f6b..000000000
--- a/staging/pciutils/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 159291 2012-05-20 23:30:35Z tomegun $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=pciutils
-pkgver=3.1.9
-pkgrel=2
-pkgdesc="PCI bus configuration space access library and tools"
-arch=(i686 x86_64)
-license=('GPL2')
-groups=('base')
-url="http://mj.ucw.cz/sw/pciutils/"
-depends=('glibc' 'hwids')
-source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-       ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e958f5ffb93b12972964381c38f27eb3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
-  cp lib/libpci.a "${srcdir}/"
-  make clean
-  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
-  install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
-  # this is now supplied by the hwids package
-  rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8.gz,hwdata}}
-}
diff --git a/staging/perl-async-interrupt/PKGBUILD b/staging/perl-async-interrupt/PKGBUILD
deleted file mode 100644
index 1fa3cdbda..000000000
--- a/staging/perl-async-interrupt/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Packager: Justin Davis (juster) <jrcd83@gmail.com>
-# $Id: PKGBUILD 159729 2012-05-26 11:40:38Z bluewind $
-
-pkgname=perl-async-interrupt
-_ver=1.1
-pkgver=1.10
-pkgrel=2
-pkgdesc='allow C/XS libraries to interrupt perl asynchronously'
-arch=(i686 x86_64)
-license=(PerlArtistic GPL)
-options=(!emptydirs)
-depends=(perl-common-sense)
-url=https://metacpan.org/release/Async-Interrupt
-source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Async-Interrupt-$_ver.tar.gz")
-md5sums=(18f19b1537ecf5d6195a6a243110e64b)
-sha512sums=(e8e62efc053c8103f509c08a19bfa0fefbfe760ca4e1e4670187de4ed4fbdec2e5a9a19bba1696cd2b721ad7fa6d4b723c24e342118b69dc8b7b1597f5e1385e)
-_dir="$srcdir/Async-Interrupt-$_ver"
-
-build()
-(
-  cd "$_dir"
-  export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps
-  unset PERL5LIB PERL_MM_OPT
-  /usr/bin/perl Makefile.PL
-  make
-)
-
-check()
-(
-  cd "$_dir"
-  export PERL_MM_USE_DEFAULT=1
-  unset PERL5LIB
-  make test
-)
-
-package()
-(
-  cd "$_dir"
-  make install INSTALLDIRS=vendor DESTDIR="$pkgdir"
-  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
-)
-
-# Local Variables:
-# mode: shell-script
-# sh-basic-offset: 2
-# End:
-# vim:set ts=2 sw=2 et:
diff --git a/staging/perl-bit-vector/PKGBUILD b/staging/perl-bit-vector/PKGBUILD
deleted file mode 100644
index 198baa3ac..000000000
--- a/staging/perl-bit-vector/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 159490 2012-05-25 02:23:56Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: K. Piche <kpiche@rogers.com>
-
-pkgname=perl-bit-vector
-_cpanname=Bit-Vector
-pkgver=7.2
-pkgrel=2
-pkgdesc='Efficient bit vector, set of integers and "big int" math library'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'PerlArtistic')
-url="http://search.cpan.org/dist/${_cpanname}/"
-depends=('perl-carp-clan' 'perl')
-options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/A/AN/ANDK/${_cpanname}-${pkgver}.tar.gz)
-md5sums=('bc6ae34738b8f889290bf50099ff8aed')
-
-build() {
-  cd "${srcdir}/${_cpanname}-$pkgver"
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_cpanname}-$pkgver"
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_cpanname}-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/perl-compress-bzip2/PKGBUILD b/staging/perl-compress-bzip2/PKGBUILD
deleted file mode 100644
index 6e98cea99..000000000
--- a/staging/perl-compress-bzip2/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 159454 2012-05-24 13:49:08Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=perl-compress-bzip2
-_realname=Compress-Bzip2
-pkgver=2.09
-pkgrel=5
-pkgdesc="Interface to Bzip2 compression library"
-arch=(i686 x86_64)
-license=(GPL2)
-depends=(perl bzip2)
-url="http://search.cpan.org/dist/Compress-Bzip2"
-options=('!emptydirs')
-source=("http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY/$_realname-$pkgver.tar.gz")
-md5sums=('1699fde3e86f2a036f135ae606d456bf')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd "$srcdir/$_realname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/staging/perl-crypt-openssl-bignum/PKGBUILD b/staging/perl-crypt-openssl-bignum/PKGBUILD
deleted file mode 100644
index e5f881bcc..000000000
--- a/staging/perl-crypt-openssl-bignum/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 47483 2011-05-23 15:54:16Z tdziedzic $
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=perl-crypt-openssl-bignum
-pkgver=0.04
-pkgrel=7
-pkgdesc="OpenSSL's multiprecision integer arithmetic "
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/Crypt-OpenSSL-Bignum"
-depends=('perl' 'openssl')
-license=('GPL')
-options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Bignum-$pkgver.tar.gz)
-md5sums=('9369ef722b0705c0604998559988eb18')
-
-build() {
-  cd  "$srcdir/Crypt-OpenSSL-Bignum-$pkgver"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-
-check() {
-  cd  "$srcdir/Crypt-OpenSSL-Bignum-$pkgver"
-
-  make test
-}
-
-package() {
-  cd  "$srcdir/Crypt-OpenSSL-Bignum-$pkgver"
-
-  make pure_install doc_install DESTDIR="$pkgdir"
-  find "$pkgdir" -name '.packlist' -delete
-  find "$pkgdir" -name '*.pod' -delete
-}
diff --git a/staging/perl-crypt-openssl-random/PKGBUILD b/staging/perl-crypt-openssl-random/PKGBUILD
deleted file mode 100644
index 24ebde127..000000000
--- a/staging/perl-crypt-openssl-random/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 47486 2011-05-23 15:55:23Z tdziedzic $
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=perl-crypt-openssl-random
-pkgver=0.04
-pkgrel=7
-pkgdesc="Interface to OpenSSL PRNG methods"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/Crypt-OpenSSL-Random"
-depends=('perl' 'openssl')
-license=('GPL')
-options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/I/IR/IROBERTS/Crypt-OpenSSL-Random-$pkgver.tar.gz)
-md5sums=('c56ac5dbdd46122eb9b8da59613b7b0a')
-
-build() {
-  cd  "$srcdir/Crypt-OpenSSL-Random-$pkgver"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd  "$srcdir/Crypt-OpenSSL-Random-$pkgver"
-
-  make test
-}
-
-package() {
-  cd  "$srcdir/Crypt-OpenSSL-Random-$pkgver"
-
-  make pure_install doc_install DESTDIR="$pkgdir"
-  find "$pkgdir" -name '.packlist' -delete
-  find "$pkgdir" -name '*.pod' -delete
-}
diff --git a/staging/perl-crypt-openssl-rsa/PKGBUILD b/staging/perl-crypt-openssl-rsa/PKGBUILD
deleted file mode 100644
index 3a44bf936..000000000
--- a/staging/perl-crypt-openssl-rsa/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 56402 2011-10-07 09:48:12Z spupykin $
-# Maintainer: Florian Pritz <bluewind@xinu.at> 
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=perl-crypt-openssl-rsa
-pkgver=0.28
-pkgrel=3
-pkgdesc="Interface to OpenSSL RSA methods"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/Crypt-OpenSSL-RSA"
-depends=('perl-crypt-openssl-random' 'perl-crypt-openssl-bignum')
-license=('GPL')
-options=('!emptydirs')
-source=("http://search.cpan.org/CPAN/authors/id/P/PE/PERLER/Crypt-OpenSSL-RSA-$pkgver.tar.gz")
-md5sums=('86217a5036fc63779c30420b5fd84129')
-
-build() {
-  cd  "$srcdir/Crypt-OpenSSL-RSA-$pkgver"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd  "$srcdir/Crypt-OpenSSL-RSA-$pkgver"
-
-  make test
-}
-
-package() {
-  cd  "$srcdir/Crypt-OpenSSL-RSA-$pkgver"
-  make pure_install doc_install DESTDIR="$pkgdir"
-  find "$pkgdir" -name '.packlist' -delete
-  find "$pkgdir" -name '*.pod' -delete
-}
diff --git a/staging/perl-crypt-ssleay/PKGBUILD b/staging/perl-crypt-ssleay/PKGBUILD
deleted file mode 100644
index 1f5842c4a..000000000
--- a/staging/perl-crypt-ssleay/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 159482 2012-05-24 21:26:53Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: François Charette <firmicus ατ gmx δοτ net>
-
-pkgname=perl-crypt-ssleay
-pkgver=0.58
-pkgrel=4
-pkgdesc="OpenSSL glue that provides LWP https support"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/Crypt-SSLeay"
-license=('GPL' 'PerlArtistic')
-depends=('openssl')
-options=('!emptydirs')
-source=(http://www.cpan.org/CPAN/authors/id/N/NA/NANIS/Crypt-SSLeay-$pkgver.tar.gz) 
-md5sums=('fbf3d12e58462cee00ea63239c0b13c7')
-
-build() {
-  cd  "${srcdir}/Crypt-SSLeay-${pkgver}"
-
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-  make test
-}
-
-package() {
-  cd  "${srcdir}/Crypt-SSLeay-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-
-  find ${pkgdir} -name '.packlist' -delete
-  find ${pkgdir} -name '*.pod' -delete
-}
diff --git a/staging/perl-dbd-mysql/PKGBUILD b/staging/perl-dbd-mysql/PKGBUILD
deleted file mode 100644
index 471b3b7a6..000000000
--- a/staging/perl-dbd-mysql/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 159494 2012-05-25 03:17:36Z eric $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: Eric Johnson <eric@coding-zone.com>
-
-pkgname=perl-dbd-mysql
-_realname=DBD-mysql
-pkgver=4.020
-pkgrel=3
-pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD"
-arch=(i686 x86_64)
-license=('GPL' 'PerlArtistic')
-url="http://search.cpan.org/dist/${_realname}/"
-depends=('libmysqlclient' 'perl-dbi' 'perl>=5.14.0')
-makedepends=('mysql')
-options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz)
-md5sums=('a2bf8808bbd45298e84dde06afbd58e9')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  # install module in vendor directories.
-  perl Makefile.PL INSTALLDIRS=vendor --testsocket=/tmp/socket.mysql
-  make
-}
-
-check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  mkdir -p /tmp/mysql_test
-  mysql_install_db \
-     --basedir=/usr \
-     --datadir=/tmp/mysql_test
-  mysqld -P 17999 \
-     --socket=/tmp/socket.mysql \
-     --datadir=/tmp/mysql_test &
-  sleep 10
-  DAEMON_PORT=$!
-  make test || true
-  kill -9 $DAEMON_PORT
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-}
diff --git a/staging/perl-dbd-sqlite/PKGBUILD b/staging/perl-dbd-sqlite/PKGBUILD
deleted file mode 100644
index 7da3b506d..000000000
--- a/staging/perl-dbd-sqlite/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 159652 2012-05-26 00:23:42Z eric $
-# Contributor: Tom Killian <tomk@runbox.com>
-# Contributor: francois at archlinux dot org
-
-pkgname=perl-dbd-sqlite
-_cpanname=DBD-SQLite
-pkgver=1.35
-pkgrel=2
-pkgdesc="Self-contained RDBMS in a DBI driver"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/${_cpanname}"
-license=('GPL' 'PerlArtistic')
-depends=('perl-dbi>=1.61' 'sqlite')
-options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/A/AD/ADAMK/${_cpanname}-${pkgver}.tar.gz)
-md5sums=('d9752e4a26fa54e74aa893dafd02ceda')
-
-build() {
-  cd "${srcdir}/${_cpanname}-${pkgver}"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_cpanname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_cpanname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-}
diff --git a/staging/perl-dbi/PKGBUILD b/staging/perl-dbi/PKGBUILD
deleted file mode 100644
index a6f8b2444..000000000
--- a/staging/perl-dbi/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 159492 2012-05-25 02:52:01Z eric $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor:  Matt Thompson <mattt@defunct.ca>
-
-pkgname=perl-dbi
-_realname=DBI
-pkgver=1.618
-pkgrel=2
-pkgdesc="Database independent interface for Perl"
-arch=('i686' 'x86_64')
-license=('GPL' 'PerlArtistic')
-url="http://search.cpan.org/dist/${_realname}/"
-depends=('perl')
-options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/T/TI/TIMB/${_realname}-${pkgver}.tar.gz)
-md5sums=('5ad29b56f7457f22bd1ca1c871b30719')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  # install module in vendor directories.
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-}
-
-# vim: ts=2 sw=2 et ft=sh
diff --git a/staging/perl-digest-nilsimsa/PKGBUILD b/staging/perl-digest-nilsimsa/PKGBUILD
deleted file mode 100644
index 02e3165f2..000000000
--- a/staging/perl-digest-nilsimsa/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 159656 2012-05-26 00:30:32Z eric $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: Manolis Tzanidakis
-
-pkgname=perl-digest-nilsimsa
-_realname=Digest-Nilsimsa
-pkgver=0.06
-pkgrel=8
-pkgdesc="Perl version of Nilsimsa code"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://search.cpan.org/dist/${_realname}/"
-depends=('perl')
-replaces=('digest-nilsimsa')
-provides=('digest-nilsimsa')
-options=(!emptydirs)
-source=(http://www.cpan.org/authors/id/V/VI/VIPUL/${_realname}-${pkgver}.tar.gz)
-md5sums=('08e940bd7f5d1167ef3fd1aa7ce234d7')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/staging/perl-digest-sha1/PKGBUILD b/staging/perl-digest-sha1/PKGBUILD
deleted file mode 100644
index 4ae6ec164..000000000
--- a/staging/perl-digest-sha1/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 159658 2012-05-26 00:37:46Z eric $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: Manolis Tzanidakis
-
-pkgname=perl-digest-sha1
-_realname=Digest-SHA1
-pkgver=2.13
-pkgrel=3
-pkgdesc="Perl interface to the SHA-1 Algorithm"
-arch=(i686 x86_64)
-license=('PerlArtistic')
-url="http://search.cpan.org/dist/${_realname}/"
-depends=('perl')
-options=(!emptydirs)
-source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz)
-replaces=('digest-sha1')
-provides=('digest-sha1')
-md5sums=('bd22388f268434f2b24f64e28bf1aa35')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  # install module in vendor directories.
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/staging/perl-ev/PKGBUILD b/staging/perl-ev/PKGBUILD
deleted file mode 100644
index 41e569b0d..000000000
--- a/staging/perl-ev/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Packager: Justin Davis (juster) <jrcd83@gmail.com>
-# $Id: PKGBUILD 159731 2012-05-26 11:42:13Z bluewind $
-
-pkgname=perl-ev
-pkgver=4.11
-pkgrel=2
-pkgdesc='perl interface to libev, a high performance full-featured event loop'
-arch=(i686 x86_64)
-license=(PerlArtistic GPL)
-options=(!emptydirs)
-depends=(perl-common-sense)
-url=https://metacpan.org/release/EV
-source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/EV-$pkgver.tar.gz")
-md5sums=(405c6d74f9dff12918b12560c1a57877)
-sha512sums=(6aca3eeb617a313de7947b760558c12ed85af4fa8efd5bb4fd8bc2f271b4556312989aebf77cda4e212fd3b1351c268624aeaf2b1cf700507ff46c0c9dcc9db8)
-_dir="$srcdir/EV-$pkgver"
-
-build()
-(
-  cd "$_dir"
-  export PERL_MM_USE_DEFAULT=1 PERL_AUTOINSTALL=--skipdeps
-  unset PERL5LIB PERL_MM_OPT
-  /usr/bin/perl Makefile.PL
-  make
-)
-
-check()
-(
-  cd "$_dir"
-  export PERL_MM_USE_DEFAULT=1
-  unset PERL5LIB
-  make test
-)
-
-package()
-(
-  cd "$_dir"
-  make install INSTALLDIRS=vendor DESTDIR="$pkgdir"
-  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
-)
-
-# Local Variables:
-# mode: shell-script
-# sh-basic-offset: 2
-# End:
-# vim:set ts=2 sw=2 et:
diff --git a/staging/perl-event/PKGBUILD b/staging/perl-event/PKGBUILD
deleted file mode 100644
index f12acdbfc..000000000
--- a/staging/perl-event/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 159660 2012-05-26 00:45:46Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Contributor: François Charette <francois.archlinux.org>
-
-pkgname=perl-event
-_srcname=Event
-pkgver=1.20
-pkgrel=2
-pkgdesc="Framework for GUI events"
-arch=('i686' 'x86_64')
-license=('PerlArtistic' 'GPL')
-url="http://search.cpan.org/dist/${_srcname}/"
-depends=('perl')
-options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/J/JP/JPRIT/${_srcname}-${pkgver}.tar.gz)
-md5sums=('bdbdf6c1b235c3e13c25f3b0491c5134')
-
-build() {
-  cd "${srcdir}/${_srcname}-${pkgver}"
-
-  # install module in vendor directories.
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_srcname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_srcname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-}
diff --git a/staging/perl-fcgi/PKGBUILD b/staging/perl-fcgi/PKGBUILD
deleted file mode 100644
index 320844d7e..000000000
--- a/staging/perl-fcgi/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 159484 2012-05-24 21:30:37Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: François Charette <firmicus ατ gmx δοτ net>
-
-pkgname=perl-fcgi
-pkgver=0.74
-pkgrel=3
-pkgdesc="Fast CGI"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/FCGI"
-license=('GPL' 'PerlArtistic')
-depends=('perl')
-options=('!emptydirs')
-source=("http://www.cpan.org/CPAN/authors/id/F/FL/FLORA/FCGI-${pkgver}.tar.gz")
-md5sums=('462a77a0072480fea791a4d3095eb486')
-
-build() {
-  cd  "${srcdir}/FCGI-${pkgver}"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd  "${srcdir}/FCGI-${pkgver}"
-  make test
-}
-
-package() {
-  cd  "${srcdir}/FCGI-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-}
diff --git a/staging/perl-guard/PKGBUILD b/staging/perl-guard/PKGBUILD
deleted file mode 100644
index da440e55c..000000000
--- a/staging/perl-guard/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Packager: Justin Davis <jrcd83@gmail.com>
-# $Id: PKGBUILD 159733 2012-05-26 11:43:47Z bluewind $
-
-pkgname=perl-guard
-pkgver=1.022
-pkgrel=2
-pkgdesc="safe cleanup blocks"
-arch=(i686 x86_64)
-license=(custom:unknown)
-options=(!emptydirs)
-depends=('perl')
-url=https://metacpan.org/release/Guard
-source=("http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/Guard-${pkgver}.tar.gz")
-md5sums=(8d1d8b942fd5d0240f47906a6d6fac8c)
-sha512sums=(9eb1c4fa29f6190115fe11215ff5d27bb3e7f5ab60c7f40c4142ad9ff8aad91b0b169204e4d0f1b1638381c0c99e6a0b5627b8b6d60fad62f1392a9d1e49751e)
-_distdir="${srcdir}/Guard-${pkgver}"
-
-build() {
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
-      PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
-      MODULEBUILDRC=/dev/null
-
-    cd "$_distdir"
-    /usr/bin/perl Makefile.PL
-    make
-  )
-}
-
-check() {
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
-    cd "$_distdir"
-    make test
-  )
-}
-
-package() {
-    cd "$_distdir"
-    make DESTDIR="$pkgdir" install
-    find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
-}
-
-# Local Variables:
-# mode: shell-script
-# sh-basic-offset: 2
-# End:
-# vim:set ts=2 sw=2 et:
diff --git a/staging/perl-html-parser/PKGBUILD b/staging/perl-html-parser/PKGBUILD
deleted file mode 100644
index e6c38d52f..000000000
--- a/staging/perl-html-parser/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 159662 2012-05-26 00:49:53Z eric $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: Manolis Tzanidakis
-# Contributor: Firmicus <francois.archlinux.org> 
-
-pkgname=perl-html-parser
-_realname=HTML-Parser
-pkgver=3.69
-pkgrel=2
-pkgdesc="Perl HTML parser class"
-arch=('i686' 'x86_64')
-license=('PerlArtistic')
-url="http://search.cpan.org/dist/${_realname}/"
-depends=('perl-html-tagset' 'perl>=5.12.1')
-options=(!emptydirs)
-source=(http://www.cpan.org/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz)
-md5sums=('d22cc6468ce670a56034be907e4e7c54')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  # install module in vendor directories.
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/staging/perl-libintl-perl/PKGBUILD b/staging/perl-libintl-perl/PKGBUILD
deleted file mode 100644
index 9eaec27d6..000000000
--- a/staging/perl-libintl-perl/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 159666 2012-05-26 01:00:46Z eric $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=perl-libintl-perl
-_realname=libintl-perl
-pkgver=1.20
-pkgrel=4
-pkgdesc="Perl Module: Localization support"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://search.cpan.org/dist/${_realname}/"
-depends=('gettext' 'perl')
-options=(!emptydirs)
-source=(http://www.cpan.org/authors/id/G/GU/GUIDO/${_realname}-$pkgver.tar.gz)
-md5sums=('cb36f58a7d2e15974f25b35381548b1b')
-
-build() {
-  cd "${srcdir}/${_realname}-$pkgver"
-  # install module in vendor directories.
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_realname}-$pkgver"
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_realname}-$pkgver"
-  make install DESTDIR="${pkgdir}"
-}
diff --git a/staging/perl-list-moreutils/PKGBUILD b/staging/perl-list-moreutils/PKGBUILD
deleted file mode 100644
index 3b0b7b33f..000000000
--- a/staging/perl-list-moreutils/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 159735 2012-05-26 11:45:02Z bluewind $
-# Maintainer : Justin "juster" Davis <jrcd83@gmail.com>
-# Generator  : pbjam 0.01
-
-pkgname=perl-list-moreutils
-pkgver=0.33
-pkgrel=3
-pkgdesc="Provide the stuff missing in List::Util"
-arch=(i686 x86_64)
-license=(PerlArtistic GPL)
-options=(!emptydirs)
-depends=('perl>=5.5.30')
-url=http://search.cpan.org/dist/List-MoreUtils
-source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/List-MoreUtils-${pkgver}.tar.gz")
-md5sums=(8a33c84028cc2ff3e92c92434b326c0f)
-sha512sums=(e758b995438c5c5322317aab3602e89b9f683c42d403a0ac97ccd8cc20d0db1a75caefc22f34ad088314867c0bdd9c2b8264e8f2f6a43eab1421aa8c482233b5)
-_distdir="${srcdir}/List-MoreUtils-${pkgver}"
-
-build() {
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
-      PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
-      MODULEBUILDRC=/dev/null
-
-    cd "$_distdir"
-    /usr/bin/perl Makefile.PL
-    make
-  )
-}
-
-check() {
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
-    cd "$_distdir"
-    make test
-  )
-}
-
-package() {
-    cd "$_distdir"
-    make DESTDIR="$pkgdir" install
-    find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
-}
-
-# Local Variables:
-# mode: shell-script
-# sh-basic-offset: 2
-# End:
-# vim:set ts=2 sw=2 et:
diff --git a/staging/perl-locale-gettext/PKGBUILD b/staging/perl-locale-gettext/PKGBUILD
deleted file mode 100644
index cb0d8bc3b..000000000
--- a/staging/perl-locale-gettext/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 159486 2012-05-24 21:34:25Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Mark Rosenstand <mark@borkware.net>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=perl-locale-gettext
-_realname=gettext
-pkgver=1.05
-pkgrel=9
-pkgdesc="Permits access from Perl to the gettext() family of functions"
-arch=('i686' 'x86_64')
-license=('GPL' 'PerlArtistic')
-url="http://search.cpan.org/dist/${_realname}/"
-depends=('gettext' 'perl')
-options=(!emptydirs)
-source=("http://search.cpan.org/CPAN/authors/id/P/PV/PVANDRY/${_realname}-${pkgver}.tar.gz"
-        'compatibility-with-POSIX-module.patch')
-md5sums=('f3d3f474a1458f37174c410dfef61a46'
-         '854302f34d01a2f8ae739187788973dd')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  patch -Np1 -i ${srcdir}/compatibility-with-POSIX-module.patch
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-
-  # remove perllocal.pod and .packlist
-  find "${pkgdir}" -name perllocal.pod -delete
-  find "${pkgdir}" -name .packlist -delete
-}
diff --git a/staging/perl-locale-gettext/compatibility-with-POSIX-module.patch b/staging/perl-locale-gettext/compatibility-with-POSIX-module.patch
deleted file mode 100644
index ad675516b..000000000
--- a/staging/perl-locale-gettext/compatibility-with-POSIX-module.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/gettext.pm	2005-05-31 20:11:16.000000000 -0700
-+++ b/gettext.pm	2009-10-07 12:39:42.000000000 -0700
-@@ -32,6 +32,7 @@
- =cut
- 
- use Carp;
-+use POSIX qw(:locale_h);
- 
- require Exporter;
- require DynaLoader;
diff --git a/staging/perl-net-dns/PKGBUILD b/staging/perl-net-dns/PKGBUILD
deleted file mode 100644
index aba8a4e5a..000000000
--- a/staging/perl-net-dns/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 159670 2012-05-26 01:09:03Z eric $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: Manolis Tzanidakis
-
-pkgname=perl-net-dns
-_realname=Net-DNS
-pkgver=0.68
-pkgrel=2
-pkgdesc="Perl Module: Interface to the DNS resolver."
-arch=('i686' 'x86_64')
-license=('PerlArtistic')
-url="http://search.cpan.org/dist/${_realname}/"
-depends=('perl-digest-hmac' 'perl-net-ip' 'perl')
-options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/O/OL/OLAF/${_realname}-$pkgver.tar.gz)
-md5sums=('05c0f6955747758bb5c9578d9bc6c3a5')
-
-build() {
-  cd "$srcdir/${_realname}-${pkgver}"
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "$srcdir/${_realname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "$srcdir/${_realname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/staging/perl-net-ssleay/PKGBUILD b/staging/perl-net-ssleay/PKGBUILD
deleted file mode 100644
index 78733dbbd..000000000
--- a/staging/perl-net-ssleay/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 159480 2012-05-24 21:23:03Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Manolis Tzanidakis
-
-pkgname=perl-net-ssleay
-_cpanname=Net-SSLeay
-pkgver=1.48
-pkgrel=2
-pkgdesc="Perl extension for using OpenSSL"
-arch=('i686' 'x86_64')
-license=('custom:BSD')
-url="http://search.cpan.org/dist/${_cpanname}/"
-depends=('openssl')
-options=(!emptydirs)
-replaces=('net-ssleay')
-provides=('net-ssleay')
-source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz")
-md5sums=('4e10d9da28f26732e37807820bf72af5')
-
-build() {
-  cd ${srcdir}/${_cpanname}-${pkgver}
-
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL -- INSTALLDIRS=vendor 
-  make
-}
-
-package() {
-  cd ${srcdir}/${_cpanname}-${pkgver}
-
-  make install DESTDIR=${pkgdir} 
-
-  # remove perllocal.pod and .packlist
-  find ${pkgdir} -name perllocal.pod -delete
-  find ${pkgdir} -name .packlist -delete
-
-  install -D -m644 README "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/perl-netaddr-ip/PKGBUILD b/staging/perl-netaddr-ip/PKGBUILD
deleted file mode 100644
index 39df34775..000000000
--- a/staging/perl-netaddr-ip/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 159676 2012-05-26 01:15:09Z eric $
-# Maintainer:
-# Contributor: Dale Blount <dale@archlinux.org>
-# Contributor: Francois Charette <francois.archlinux.org>
-
-pkgname=perl-netaddr-ip
-_realname=NetAddr-IP
-pkgver=4.058
-pkgrel=2
-pkgdesc="Perl module to manage IP addresses and subnets"
-arch=(i686 x86_64)
-license=('PerlArtistic' 'GPL')
-depends=('perl')
-options=('!emptydirs')
-url="http://search.cpan.org/dist/${_realname}/"
-source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/${_realname}-${pkgver}.tar.gz)
-md5sums=('8829958dd84a8b36e3cd10347564739d')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  # install module in vendor directories.
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/perl-sdl/PKGBUILD b/staging/perl-sdl/PKGBUILD
deleted file mode 100644
index 5acdbbc4e..000000000
--- a/staging/perl-sdl/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 159674 2012-05-26 01:12:57Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=perl-sdl
-pkgver=2.536
-pkgrel=1
-pkgdesc="Simple DirectMedia Layer for Perl"
-arch=(i686 x86_64)
-license=(LGPL)
-url="http://sdl.perl.org"
-depends=(perl-alien-sdl perl-tie-simple
-         sdl_{net,ttf,image,mixer,gfx,pango} mesa smpeg)
-#makedepends=(perl-yaml)
-options=('!emptydirs')
-replaces=(sdl_perl)
-conflicts=(sdl_perl)
-provides=("sdl_perl=$pkgver")
-# http://search.cpan.org/dist/SDL/
-_author=FROGGS
-source=(http://search.cpan.org/CPAN/authors/id/${_author:0:1}/${_author:0:2}/$_author/SDL-$pkgver.tar.gz)
-md5sums=('5c682e8a96cd655e959497b034b978ce')
-
-build() {
-  cd "$srcdir/SDL-$pkgver"
-  # Perl selects the proper CFLAGS set for binary modules
-  unset CFLAGS
-  # install module in vendor directories
-  perl Build.PL installdirs=vendor
-  perl Build
-}
-
-check() {
-  cd "$srcdir/SDL-$pkgver"
-  perl Build test || true
-}
-
-package() {
-  cd "$srcdir/SDL-$pkgver"
-  perl Build install destdir="$pkgdir"
-}
diff --git a/staging/perl-socket6/PKGBUILD b/staging/perl-socket6/PKGBUILD
deleted file mode 100644
index 88c8acc07..000000000
--- a/staging/perl-socket6/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Generator  : CPANPLUS::Dist::Arch 1.18
-
-pkgname='perl-socket6'
-pkgver='0.23'
-pkgrel='2'
-pkgdesc="getaddrinfo/getnameinfo support module"
-arch=('i686' 'x86_64')
-license=('PerlArtistic' 'GPL')
-options=('!emptydirs')
-depends=('perl')
-makedepends=()
-url='http://search.cpan.org/dist/Socket6'
-source=('http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-0.23.tar.gz')
-md5sums=('2c02adb13c449d48d232bb704ddbd492')
-sha512sums=('39ced223ecdef89e6fa241031019bb5a73e63d2dfdaf3edb55bfea0cb81b91bea09f1cc26b2d15fa28d32227cc13cdb093c70f0ba346c9bdb523359de53d96f9')
-_distdir="${srcdir}/Socket6-0.23"
-
-build() {
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
-      PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
-      MODULEBUILDRC=/dev/null
-
-    cd "$_distdir"
-    /usr/bin/perl Makefile.PL
-    make
-  )
-}
-
-check() {
-  cd "$_distdir"
-  ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
-    make test
-  )
-}
-
-package() {
-  cd "$_distdir"
-  make install
-  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
-}
-
-# Local Variables:
-# mode: shell-script
-# sh-basic-offset: 2
-# End:
-# vim:set ts=2 sw=2 et:
diff --git a/staging/perl-template-toolkit/PKGBUILD b/staging/perl-template-toolkit/PKGBUILD
deleted file mode 100644
index fdce31abc..000000000
--- a/staging/perl-template-toolkit/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Firmicus <francois.archlinux.org>
-# Contributor: Tom Killian <tomk@runbox.com>
-# Contributor: FJ <joostef@gmail.com>
-
-pkgname=perl-template-toolkit
-_realname=Template-Toolkit
-pkgver=2.22
-pkgrel=5
-pkgdesc="Perl template processing system"
-arch=(i686 x86_64)
-license=('PerlArtistic')
-url="http://search.cpan.org/dist/${_realname}/"
-depends=('perl-appconfig' 'perl>=5.10.0')
-options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/A/AB/ABW/${_realname}-$pkgver.tar.gz) 
-md5sums=('d98277f6420e5da6b93d99a8db2b3934')
-
-build() {
-  cd ${srcdir}/${_realname}-$pkgver
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-package() {
-  cd ${srcdir}/${_realname}-$pkgver
-  make install DESTDIR=${startdir}/pkg
-
-  # remove perllocal.pod and .packlist
-  find ${startdir}/pkg -name perllocal.pod -delete
-  find ${startdir}/pkg -name .packlist -delete
-}
diff --git a/staging/perl-term-readkey/PKGBUILD b/staging/perl-term-readkey/PKGBUILD
deleted file mode 100644
index 9de54dc1a..000000000
--- a/staging/perl-term-readkey/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 159678 2012-05-26 01:25:20Z eric $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-# Contributor: Francois Charette <francois.archlinux.org> 
-
-pkgname=perl-term-readkey
-_realname=TermReadKey
-pkgver=2.30.02
-pkgrel=2
-pkgdesc="Provides simple control over terminal driver modes"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('perl' 'glibc')
-url="http://search.cpan.org/~stsi/${_realname}/"
-options=('!emptydirs')
-source=(http://search.cpan.org/CPAN/authors/id/S/ST/STSI/${_realname}-$pkgver.tar.gz)
-md5sums=('69b92c8ddca8691c83823c683cd9838a')
-
-build() {
-  cd "${srcdir}/TermReadKey-$pkgver"
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/TermReadKey-$pkgver"
-  make test
-}
-
-package() {
-  cd "${srcdir}/TermReadKey-$pkgver"
-  make DESTDIR="${pkgdir}" install
-  chmod 755 "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Term/ReadKey/ReadKey.so"
-  install -d "${pkgdir}/usr/share/licenses/$pkgname/"
-  head -7 README > "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/staging/perl-text-iconv/PKGBUILD b/staging/perl-text-iconv/PKGBUILD
deleted file mode 100644
index 9fa7def9d..000000000
--- a/staging/perl-text-iconv/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 159683 2012-05-26 01:29:23Z eric $
-# Maintainer: 
-# Contributor: Francois Charette <firmicus@gmx.net>
-
-pkgname=perl-text-iconv
-_realname=Text-Iconv
-pkgver=1.7
-pkgrel=7
-pkgdesc="Interface to iconv codeset conversion"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/${_realname}/"
-license=('GPL' 'PerlArtistic')
-depends=('perl')
-options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/M/MP/MPIOTR/${_realname}-${pkgver}.tar.gz) 
-md5sums=('81b26e069eaebb084e91ea3c009b67ae')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/perl-time-hires/PKGBUILD b/staging/perl-time-hires/PKGBUILD
deleted file mode 100644
index d0e8d638f..000000000
--- a/staging/perl-time-hires/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 159488 2012-05-24 21:38:51Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: mezcal <fila at pruda dot com>
-
-pkgname=perl-time-hires
-pkgver=1.9725
-pkgrel=2
-pkgdesc="Perl module: high resolution time, sleep, and alarm"
-arch=('i686' 'x86_64')
-license=('PerlArtistic')
-url="http://search.cpan.org/dist/Time-HiRes/"
-depends=('perl')
-options=(!emptydirs)
-source=("http://search.cpan.org/CPAN/authors/id/Z/ZE/ZEFRAM/Time-HiRes-${pkgver}.tar.gz")
-md5sums=('cb1108c076d26f3d2fed0bb91313135a')
-
-build() {
-  cd "${srcdir}/Time-HiRes-${pkgver}"
-
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-
-  make
-}
-
-check() {
-  cd "${srcdir}/Time-HiRes-${pkgver}"
-
-  make test
-}
-
-package() {
-  cd "${srcdir}/Time-HiRes-${pkgver}"
-
-  make install DESTDIR="${pkgdir}"
-}
diff --git a/staging/perl-tk/PKGBUILD b/staging/perl-tk/PKGBUILD
deleted file mode 100644
index 0396f4bb2..000000000
--- a/staging/perl-tk/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 159686 2012-05-26 02:00:46Z eric $
-# Maintainer: François Charette <francois ατ archlinux δοτ org>
-# Contributor: Jason Chu <jchu@xentac.net>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=perl-tk
-_cpanname=Tk
-pkgver=804.030
-pkgrel=3
-pkgdesc="A graphical user interface toolkit for Perl"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/${_cpanname}"
-license=('PerlArtistic' 'GPL' 'custom')
-depends=('libpng' 'libjpeg' 'tk' 'perl')
-options=('!emptydirs')
-replaces=('perltk')
-provides=('perltk')
-source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz)
-md5sums=('13275e85f99ee467a86d9598a437abff')
-
-build() {
-  cd "$srcdir/${_cpanname}-$pkgver"
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-#check() {
-#  cd "$srcdir/${_cpanname}-$pkgver"
-#  make test
-#}
-
-package() {
-  cd "$srcdir/${_cpanname}-$pkgver"
-  make install DESTDIR="$pkgdir"
-
-  # license
-  install -D -m644 pTk/license.terms \
-                   "${pkgdir}/usr/share/licenses/${pkgname}/tk.license"
-  install -D -m644 pTk/Tix.license \
-                   "${pkgdir}/usr/share/licenses/${pkgname}/tix.license"
-}
diff --git a/staging/perl-unicode-string/PKGBUILD b/staging/perl-unicode-string/PKGBUILD
deleted file mode 100644
index b08464be7..000000000
--- a/staging/perl-unicode-string/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 159688 2012-05-26 02:19:07Z eric $
-# Maintainer: James Rayner <iphitus@gmail.com>
-# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
-
-pkgname=perl-unicode-string
-_realname=Unicode-String
-pkgver=2.09
-pkgrel=7
-pkgdesc="String of Unicode characters for perl (UCS2/UTF16)"
-arch=('i686' 'x86_64')
-license=('PerlArtistic')
-url="http://search.cpan.org/dist/${_realname}/"
-depends=('perl')
-options=(!emptydirs)
-source=(http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/${_realname}-${pkgver}.tar.gz)
-md5sums=('553e68e603723bf7c631f8701ab0d678')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  # in stall module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-}
diff --git a/staging/perl-xml-parser/PKGBUILD b/staging/perl-xml-parser/PKGBUILD
deleted file mode 100644
index e46bfce2e..000000000
--- a/staging/perl-xml-parser/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 159672 2012-05-26 01:11:32Z heftig $
-# Maintainer:
-# Contributor: firmicus <francois@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: herb <hrose@archlinux.org>
-
-pkgname=perl-xml-parser
-_realname=XML-Parser
-pkgver=2.41
-pkgrel=3
-pkgdesc="Expat-based XML parser module for perl"
-arch=('i686' 'x86_64')
-license=('GPL' 'PerlArtistic')
-url="http://search.cpan.org/dist/${_realname}/"
-depends=('perl' 'expat')
-replaces=('perlxml')
-provides=("perlxml=${pkgver}")
-options=('!emptydirs')
-source=("http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/${_realname}-${pkgver}.tar.gz")
-md5sums=('c320d2ffa459e6cdc6f9f59c1185855e')
-
-build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  # install module in vendor directories.
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  make install DESTDIR="${pkgdir}"
-
-  # remove perllocal.pod and .packlist.
-  find "${pkgdir}" -name perllocal.pod -delete
-  find "${pkgdir}" -name .packlist -delete
-}
diff --git a/staging/perl-yaml-syck/PKGBUILD b/staging/perl-yaml-syck/PKGBUILD
deleted file mode 100644
index 045509ca5..000000000
--- a/staging/perl-yaml-syck/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 159692 2012-05-26 02:34:17Z eric $
-# This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman
-# Maintainer: kevin <kevin@archlinux.org>
-
-pkgname=perl-yaml-syck
-_realname=YAML-Syck
-pkgver=1.20
-pkgrel=2
-pkgdesc="Fast, lightweight YAML loader and dumper"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://search.cpan.org/dist/${_realname}/"
-depends=('perl')
-options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz)
-md5sums=('8f6d04ee5817b8479e1234264a8d458d')
-
-build() {
-  cd "${srcdir}/${_realname}-$pkgver"
-
-  # install module in vendor directories.
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}/${_realname}-$pkgver"
-  make test
-}
-
-package() {
-  cd "${srcdir}/${_realname}-$pkgver"
-  make install DESTDIR="${pkgdir}"
-
-  # license.
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
diff --git a/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
deleted file mode 100644
index 1404460df..000000000
--- a/staging/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Thu, 28 Apr 2011 09:18:54 +0300
-Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in
- EU::CBuilder
-
-Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4),
-CFLAGS and LDFLAGS from the environment have overridden the Config.pm
-ccflags and ldflags settings. This can cause binary incompatibilities
-between the core Perl and extensions built with EU::CBuilder.
-
-Append to the Config.pm values rather than overriding them.
----
- .../lib/ExtUtils/CBuilder/Base.pm                  |    6 +++-
- dist/ExtUtils-CBuilder/t/04-base.t                 |   25 +++++++++++++++++++-
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-index b572312..2255c51 100644
---- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-+++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-@@ -40,11 +40,13 @@ sub new {
-     $self->{config}{$k} = $v unless exists $self->{config}{$k};
-   }
-   $self->{config}{cc} = $ENV{CC} if defined $ENV{CC};
--  $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS};
-+  $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS})
-+     if defined $ENV{CFLAGS};
-   $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX};
-   $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS};
-   $self->{config}{ld} = $ENV{LD} if defined $ENV{LD};
--  $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS};
-+  $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS})
-+     if defined $ENV{LDFLAGS};
- 
-   unless ( exists $self->{config}{cxx} ) {
-     my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/);
-diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t
-index c3bf6b5..1bb15aa 100644
---- a/dist/ExtUtils-CBuilder/t/04-base.t
-+++ b/dist/ExtUtils-CBuilder/t/04-base.t
-@@ -1,7 +1,7 @@
- #! perl -w
- 
- use strict;
--use Test::More tests => 50;
-+use Test::More tests => 64;
- use Config;
- use Cwd;
- use File::Path qw( mkpath );
-@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args,
-     "_prepare_mksymlists_args(): got expected arguments for Mksymlists",
- );
- 
-+my %testvars = (
-+    CFLAGS  => 'ccflags',
-+    LDFLAGS => 'ldflags',
-+);
-+
-+while (my ($VAR, $var) = each %testvars) {
-+    local $ENV{$VAR};
-+    $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+    ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+    isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+    like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+        "honours $var from Config.pm");
-+
-+    $ENV{$VAR} = "-foo -bar";
-+    $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+    ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+    isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+    like($base->{config}{$var}, qr/\Q$ENV{$VAR}/,
-+        "honours $VAR from the environment");
-+    like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+        "doesn't override $var from Config.pm with $VAR from the environment");
-+}
-+
- #####
- 
- for ($source_file, $object_file, $lib_file) {
--- 
-1.7.4.4
-
diff --git a/staging/perl/ChangeLog b/staging/perl/ChangeLog
deleted file mode 100644
index 9add39e20..000000000
--- a/staging/perl/ChangeLog
+++ /dev/null
@@ -1,66 +0,0 @@
-2011-06-22 Angel Velasquez <angvp@archlinux.org>
-    * Added a patch for ExtUtils doesnt overwrite CFLAGS and LDFLAGS
-    * Fixed #FS22197, FS#22441, FS#24767
-    * Rebuilt perl 5.14.1-2 against db 5.2.28
-
-2011-06-16 Angel Velasquez <angvp@archlinux.org>
-    * Fixed #FS24660
-    * Rebuilt against db 5.2.28
-
-2011-05-16  Angel Velasquez <angvp@archlinux.org>
-    * perl 5.14.0
-    * Removed patch for h2ph warning from 5.12.3
-    * Removed provides array, you can use corelist -v 5.14.0 to know the
-    modules included with the perl core, through Module::CoreList (thx j3nnn1
-    for the tip)
-
-2010-11-07  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.2-1
-    - Using /usr/bin/*_perl for script directories
-
-2010-11-06  kevin  <kevin@archlinux.org>
-
-    - Removed otherlibdirs directive from Configure
-    - Removed /usr/*/perl5/site_perl/5.10.1 from INC
-    - Finally removed legacy dirs /usr/lib/perl5/current and
-      /usr/lib/perl5/site_perl/current from @INC
-
-2010-05-23  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.1-2
-    - Francois updated the provides array.
-
-2010-05-23  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.1-1
-
-2010-05-16  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.0-2
-
-2010-05-12  kevin  <kevin@archlinux.org>
-
-    - FS#19411.  Removed the for loop in perlbin.sh which didn't work on zsh.
-      This makes the loop variables unnecessary so the script no longer
-      pollutes the user's environment.
-    - FS#19427.  Added /usr/*/perl5/site_perl/5.10.1 to otherlibdirs to support
-      user built modules.
-
-2010-05-09  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.0-1
-    - Modified perlbin.sh to only add existing dirs to PATH.  Fixes FS#17402,
-      path points to non-existant directories 
-
-2010-05-07  kevin  <kevin@archlinux.org>
-
-    - Added this changelog.
-    - Added -Dinc_version_list=none to fix FS#19136, double entry in @INC.
-      This removes the duplicates and versioned directory entries.
-    - Change scriptdirs to /usr/lib/perl5/{core,vendor,site}_perl/bin to fix
-      Fix FS#13808, binaries don't follow FHS.
-    - Stopped using versioned directories in sitelib and sitearch.
-
-
-# vim: set ft=changelog ts=4 sw=4 et:
diff --git a/staging/perl/PKGBUILD b/staging/perl/PKGBUILD
deleted file mode 100644
index 4204a4983..000000000
--- a/staging/perl/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# $Id: PKGBUILD 159441 2012-05-24 12:05:52Z bluewind $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: kevin <kevin.archlinux.org>
-# Contributor: judd <jvinet.zeroflux.org>
-# Contributor: francois <francois.archlinux.org> 
-pkgname=perl
-pkgver=5.16.0
-pkgrel=2
-pkgdesc="A highly capable, feature-rich programming language"
-arch=(i686 x86_64)
-license=('GPL' 'PerlArtistic')
-url="http://www.perl.org"
-groups=('base')
-depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh')
-changelog=ChangeLog
-source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 
-perlbin.sh
-perlbin.csh
-provides.pl)
-install=perl.install
-options=('makeflags' '!purge')
-md5sums=('15a2f95fb27231e10998240f13acf961'
-         '5ed2542fdb9a60682f215bd33701e61a'
-         '1f0cbbee783e8a6d32f01be5118e0d5e'
-         '999c3eea6464860704abbb055a0f0896')
-
-# workaround to let the integrity check find the correct provides array
-if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then
-	true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p'))
-fi
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    # for x86_64
-    arch_opts="-Dcccdlflags='-fPIC'"
-  else 
-    # for i686
-    arch_opts=""
-  fi
-
-  ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \
-    -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \
-    -Dprivlib=/usr/share/perl5/core_perl \
-    -Darchlib=/usr/lib/perl5/core_perl \
-    -Dsitelib=/usr/share/perl5/site_perl \
-    -Dsitearch=/usr/lib/perl5/site_perl \
-    -Dvendorlib=/usr/share/perl5/vendor_perl \
-    -Dvendorarch=/usr/lib/perl5/vendor_perl \
-    -Dscriptdir=/usr/bin/core_perl \
-    -Dsitescript=/usr/bin/site_perl \
-    -Dvendorscript=/usr/bin/vendor_perl \
-    -Dinc_version_list=none \
-    -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \
-    -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}"
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  TEST_JOBS=$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/') make test_harness
-#  make test
-}
-
-package() {
-  # hack to work around makepkg running the subshell in check_sanity()
-  new_provides=($(cd "$srcdir/perl-$pkgver"; LD_PRELOAD=./libperl.so ./perl -Ilib "$srcdir/provides.pl" .))
-  provides=(${new_provides[@]})
-
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make install
-
-  ### Perl Settings ###
-  # Change man page extensions for site and vendor module builds.
-  # Use archlinux email address instead of my own.
-  sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \
-      -e "/^cf_email=/ s/'.*'/'kevin@archlinux.org'/" \
-      -e "/^perladmin=/ s/'.*'/'kevin@archlinux.org'/" \
-      -i ${pkgdir}/usr/lib/perl5/core_perl/Config_heavy.pl
-
-  ### CPAN Settings ###
-  # Set CPAN default config to use the site directories.
-  sed -e '/(makepl_arg =>/   s/""/"INSTALLDIRS=site"/' \
-      -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \
-      -i ${pkgdir}/usr/share/perl5/core_perl/CPAN/FirstTime.pm
-
-  ### CPANPLUS Settings ###
-  # Set CPANPLUS default config to use the site directories.
-  sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \
-      -e "/{'buildflags'}/     s/'';/'installdirs=site';/" \
-      -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm
-
-  # Profile script to set paths to perl scripts.
-  install -D -m755 ${srcdir}/perlbin.sh \
-                   ${pkgdir}/etc/profile.d/perlbin.sh
-  # Profile script to set paths to perl scripts on csh. (FS#22441) 
-  install -D -m755 ${srcdir}/perlbin.csh \
-                  ${pkgdir}/etc/profile.d/perlbin.csh
-
-  (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl)
-  (cd ${pkgdir}/usr/bin/core_perl;  ln -sf c2ph pstruct; ln -sf s2p psed)
-  grep -Rl "${pkgdir}" ${pkgdir}/usr | \
-      xargs sed -i "s^${pkgdir}^^g"
-
-  # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/
-  # (FS#16488)
-  rm -f $pkgdir/usr/share/perl5/core_perl/*.pod
-  for d in $pkgdir/usr/share/perl5/core_perl/*; do
-    if [ -d $d -a $(basename $d) != "pod" ]; then
-      find $d -name *.pod -delete
-    fi
-  done
-  find $pkgdir/usr/lib -name *.pod -delete
-  find $pkgdir -name .packlist -delete
-}
diff --git a/staging/perl/digest_eval_hole.diff b/staging/perl/digest_eval_hole.diff
deleted file mode 100644
index 47904137b..000000000
--- a/staging/perl/digest_eval_hole.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-From 4b6a7324284e7435a361c58f7ddb32fc0c635bd0 Mon Sep 17 00:00:00 2001
-From: "Michael G. Schwern" <schwern@pobox.com>
-Date: Mon, 3 Oct 2011 19:05:29 +0100
-Subject: Close the eval "require $module" security hole in
- Digest->new($algorithm)
-
-Also the filter was incomplete.
-
-Bug-Debian: http://bugs.debian.org/644108
-
-Patch-Name: fixes/digest_eval_hole.diff
----
- cpan/Digest/Digest.pm    |    6 ++++--
- cpan/Digest/t/security.t |   14 ++++++++++++++
- 2 files changed, 18 insertions(+), 2 deletions(-)
- create mode 100644 cpan/Digest/t/security.t
-
-diff --git a/cpan/Digest/Digest.pm b/cpan/Digest/Digest.pm
-index 384dfc8..d714434 100644
---- a/cpan/Digest/Digest.pm
-+++ b/cpan/Digest/Digest.pm
-@@ -24,7 +24,7 @@ sub new
-     shift;  # class ignored
-     my $algorithm = shift;
-     my $impl = $MMAP{$algorithm} || do {
--	$algorithm =~ s/\W+//;
-+	$algorithm =~ s/\W+//g;
- 	"Digest::$algorithm";
-     };
-     $impl = [$impl] unless ref($impl);
-@@ -35,7 +35,9 @@ sub new
- 	($class, @args) = @$class if ref($class);
- 	no strict 'refs';
- 	unless (exists ${"$class\::"}{"VERSION"}) {
--	    eval "require $class";
-+	    my $pm_file = $class . ".pm";
-+	    $pm_file =~ s{::}{/}g;
-+	    eval { require $pm_file };
- 	    if ($@) {
- 		$err ||= $@;
- 		next;
-diff --git a/cpan/Digest/t/security.t b/cpan/Digest/t/security.t
-new file mode 100644
-index 0000000..5cba122
---- /dev/null
-+++ b/cpan/Digest/t/security.t
-@@ -0,0 +1,14 @@
-+#!/usr/bin/env perl
-+
-+# Digest->new() had an exploitable eval
-+
-+use strict;
-+use warnings;
-+
-+use Test::More tests => 1;
-+
-+use Digest;
-+
-+$LOL::PWNED = 0;
-+eval { Digest->new(q[MD;5;$LOL::PWNED = 42]) };
-+is $LOL::PWNED, 0;
diff --git a/staging/perl/fix-h2ph-and-tests.patch b/staging/perl/fix-h2ph-and-tests.patch
deleted file mode 100644
index a2d176ec6..000000000
--- a/staging/perl/fix-h2ph-and-tests.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 8d66b3f930dc6d88b524d103e304308ae73a46e7 Mon Sep 17 00:00:00 2001
-From: Robin Barker <rmbarker@cpan.org>
-Date: Thu, 22 Apr 2010 11:51:20 +0100
-Subject: [PATCH 1/1] Fix h2ph and test
-
----
- lib/h2ph.t    |   12 ++++++++++--
- utils/h2ph.PL |   28 +++++++++++++++++++++++-----
- 2 files changed, 33 insertions(+), 7 deletions(-)
-
-diff --git a/lib/h2ph.t b/lib/h2ph.t
-index 27dd7b9..8d62d46 100644
---- a/lib/h2ph.t
-+++ b/lib/h2ph.t
-@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) {
-     exit 0;
- }
- 
--plan(4);
-+plan(5);
- 
- # quickly compare two text files
- sub txt_compare {
-@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht',
-                    stderr => 1 );
- like( $result, qr/syntax OK$/, "output compiles");
- 
-+$result = runperl( progfile => '_h2ph_pre.ph',
-+                   switches => ['-c'],
-+                   stderr => 1 );
-+like( $result, qr/syntax OK$/, "preamble compiles");
-+
- $result = runperl( switches => ["-w"], 
--                   prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);');
-+                   stderr => 1,
-+                   prog => <<'PROG' );
-+$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);
-+PROG
- is( $result, '', "output free of warnings" );
- 
- # cleanup
-diff --git a/utils/h2ph.PL b/utils/h2ph.PL
-index 8f56db4..1255807 100644
---- a/utils/h2ph.PL
-+++ b/utils/h2ph.PL
-@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) {
- exit $Exit;
- 
- sub expr {
--    $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out.
-+    if (/\b__asm__\b/) {	# freak out
-+	$new = '"(assembly code)"';
-+	return
-+    }
-     my $joined_args;
-     if(keys(%curargs)) {
- 	$joined_args = join('|', keys(%curargs));
-@@ -770,7 +773,7 @@ sub inc_dirs
- sub build_preamble_if_necessary
- {
-     # Increment $VERSION every time this function is modified:
--    my $VERSION     = 2;
-+    my $VERSION     = 3;
-     my $preamble    = "$Dest_dir/_h2ph_pre.ph";
- 
-     # Can we skip building the preamble file?
-@@ -798,7 +801,16 @@ sub build_preamble_if_necessary
- 		# parenthesized value:  d=(v)
- 		$define{$_} = $1;
- 	    }
--	    if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
-+	    if (/^(\w+)\((\w)\)$/) {
-+		my($macro, $arg) = ($1, $2);
-+		my $def = $define{$_};
-+		$def =~ s/$arg/\$\{$arg\}/g;
-+		print PREAMBLE <<DEFINE;
-+unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } }
-+
-+DEFINE
-+	    } elsif
-+		($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
- 		# float:
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { $1 } }\n\n";
-@@ -807,8 +819,14 @@ sub build_preamble_if_necessary
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { $1 } }\n\n";
- 	    } elsif ($define{$_} =~ /^\w+$/) {
--		print PREAMBLE
--		    "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
-+		my $def = $define{$_};
-+		if ($isatype{$def}) {
-+		  print PREAMBLE
-+		    "unless (defined &$_) { sub $_() { \"$def\" } }\n\n";
-+		} else {
-+		  print PREAMBLE
-+		    "unless (defined &$_) { sub $_() { &$def } }\n\n";
-+	        }
- 	    } else {
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { \"",
--- 
-1.6.5.2.74.g610f9.dirty
-
diff --git a/staging/perl/perl.install b/staging/perl/perl.install
deleted file mode 100644
index a355c5bbe..000000000
--- a/staging/perl/perl.install
+++ /dev/null
@@ -1,10 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do
-    [ -h usr/lib/perl5/$ver ] && rm usr/lib/perl5/$ver
-    [ -h usr/lib/perl5/site_perl/$ver ] && rm usr/lib/perl5/site_perl/$ver
-    [ -h usr/bin/perl$ver ] && rm usr/bin/perl$ver
-  done
-  return 0
-}
-
diff --git a/staging/perl/perlbin.csh b/staging/perl/perlbin.csh
deleted file mode 100644
index 535f0b18d..000000000
--- a/staging/perl/perlbin.csh
+++ /dev/null
@@ -1,15 +0,0 @@
-# Set path to perl scriptdirs if they exist
-# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts
-# Added /usr/bin/*_perl dirs for scripts
-# Remove /usr/lib/perl5/*_perl/bin in next release
-
-[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl
-[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/site_perl/bin
-
-[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl
-[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/vendor_perl/bin
-
-[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl
-
-# If you have modules in non-standard directories you can add them here.
-#export PERLLIB=dir1:dir2
diff --git a/staging/perl/perlbin.sh b/staging/perl/perlbin.sh
deleted file mode 100755
index 20f830436..000000000
--- a/staging/perl/perlbin.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# Set path to perl scriptdirs if they exist
-# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts
-# Added /usr/bin/*_perl dirs for scripts
-# Remove /usr/lib/perl5/*_perl/bin in next release
-
-[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl
-[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin
-
-[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl
-[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin
-
-[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl
-
-export PATH
-
-# If you have modules in non-standard directories you can add them here.
-#export PERLLIB=dir1:dir2
-
diff --git a/staging/perl/provides.pl b/staging/perl/provides.pl
deleted file mode 100644
index d2cdc762e..000000000
--- a/staging/perl/provides.pl
+++ /dev/null
@@ -1,299 +0,0 @@
-# provides.pl
-##
-# Script for printing out a provides list of every CPAN distribution
-# that is bundled with perl. You can run it before building perl
-# or you can run it after building perl. Required modules are in core
-# for perl 5.13 and above.  It might be nice if this didn't require
-# HTTP::Tiny and maybe just used wget or curl.
-#
-# This script uses HTTP::Tiny to query Tatsuhiko Miyagawa's webapp at
-# cpanmetadb.plackperl.org to cross-reference module files to their
-# providing CPAN distribution. Thank you Miyagawa!
-#
-# - Justin "juster" Davis <jrcd83@gmail.com>
-
-use warnings 'FATAL' => 'all';
-use strict;
-
-package Common;
-
-sub evalver
-{
-    my ($path, $mod) = @_;
-
-    open my $fh, '<', $path or die "open $path: $!";
-
-    my $m = ($mod
-        ? qr/(?:\$${mod}::VERSION|\$VERSION)/
-        : qr/\$VERSION/);
-
-    while (my $ln = <$fh>) {
-        next unless $ln =~ /\s*$m\s*=\s*.+/;
-        chomp $ln;
-        my $ver = do { no strict; eval $ln };
-        return $ver unless $@;
-        die qq{$path:$. bad version string in "$ln"\n};
-    }
-
-    close $fh;
-    return undef;
-}
-
-
-#-----------------------------------------------------------------------------
-
-package Dists;
-
-sub maindistfile
-{
-    my ($dist, $dir) = @_;
-
-    # libpath is the modern style, installing modules under lib/
-    # with dirs matching the name components.
-    my $libpath = join q{/}, 'lib', split /-/, "${dist}.pm";
-
-    # dumbpath is an old style where there's no subdirs and just
-    # a .pm file.
-    my $dumbpath = $dist;
-    $dumbpath =~ s/\A.+-//;
-    $dumbpath .= ".pm";
-
-    my @paths = ($libpath, $dumbpath);
-    # Some modules (with simple names like XSLoader, lib, etc) are
-    # generated by Makefile.PL. Search through their generating code.
-    push @paths, "${dist}_pm.PL" if $dist =~ tr/-/-/ == 0;
-
-    for my $path (map { "$dir/$_" } @paths) { return $path if -f $path; }
-    return undef;
-}
-
-sub module_ver
-{
-    my ($dist, $dir) = @_;
-
-    my $path = maindistfile($dist, $dir) or return undef;
-
-    my $mod = $dist;
-    $mod =~ s/-/::/g;
-    my $ver = Common::evalver($path, $mod);
-    unless ($ver) {
-        warn "failed to find version in module file for $dist\n";
-        return undef;
-    }
-
-    return $ver;
-}
-
-sub changelog_ver
-{
-    my ($dist, $dir) = @_;
-
-    my $path;
-    for my $tmp (glob "$dir/{Changes,ChangeLog}") {
-        if (-f $tmp) { $path = $tmp; last; }
-    }
-    return undef unless $path;
-
-    open my $fh, '<', $path or die "open: $!";
-    while (<$fh>) {
-        return $1 if /\A\s*(?:$dist[ \t]*)?([0-9._]+)/;
-        return $1 if /\A\s*version\s+([0-9._]+)/i;
-    }
-    close $fh;
-
-    return undef;
-}
-
-# for some reason podlators has a VERSION file with perl code in it
-sub verfile_ver
-{
-    my ($dist, $dir) = @_;
-
-    my $path = "$dir/VERSION";
-    return undef unless -f $path; # no warning, only podlaters has it
-
-    return Common::evalver($path);
-}
-
-# scans a directory full of nicely separated dist. directories.
-sub scan_distroot
-{
-    my ($distroot) = @_;
-    opendir my $cpand, "$distroot" or die "failed to open $distroot";
-    my @dists = grep { !/^\./ && -d "$distroot/$_" } readdir $cpand;
-    closedir $cpand;
-
-    my @found;
-    for my $dist (@dists) {
-        my $distdir = "$distroot/$dist";
-        my $ver = (module_ver($dist, $distdir)
-                   || changelog_ver($dist, $distdir)
-                   || verfile_ver($dist, $distdir));
-
-        if ($ver) { push @found, [ $dist, $ver ]; }
-        else { warn "failed to find version for $dist\n"; }
-    }
-    return @found;
-}
-
-sub find
-{
-    my ($srcdir) = @_;
-    return map { scan_distroot($_) } glob "$srcdir/{cpan,dist}";
-}
-
-#-----------------------------------------------------------------------------
-
-package Modules;
-
-use HTTP::Tiny qw();
-use File::Find qw();
-use File::stat;
-
-*findfile = *File::Find::find;
-
-sub cpan_provider
-{
-    my ($module) = @_;
-    my $url = "http://cpanmetadb.plackperl.org/v1.0/package/$module";
-    my $http = HTTP::Tiny->new;
-    my $resp = $http->get($url);
-    return undef unless $resp->{'success'};
-
-    my ($cpanpath) = $resp->{'content'} =~ /^distfile: (.*)$/m
-        or return undef;
-
-    my $dist = $cpanpath;
-    $dist =~ s{\A.+/}{};    # remove author directory
-    $dist =~ s{-[^-]+\z}{}; # remove version and extension
-    return ($dist eq 'perl' ? undef : $dist);
-}
-
-sub find
-{
-    my ($srcdir) = @_;
-    my $libdir = "$srcdir/lib/";
-    die "failed to find $libdir directory" unless -d $libdir;
-
-    # Find only the module files that have not changed since perl
-    # was extracted. We don't want the files perl just recently
-    # installed into lib/. We processed those already.
-    my @modfiles;
-    my $finder = sub {
-        return unless /[.]pm\z/;
-        return if m{\Q$libdir\E[^/]+/t/}; # ignore testing modules
-        push @modfiles, $_;
-    };
-    findfile({ 'no_chdir' => 1, 'wanted' => $finder }, $libdir);
-
-    # First we have to find what the oldest ctime actually is.
-    my $oldest = time;
-    @modfiles = map {
-        my $modfile = $_;
-        my $ctime = (stat $modfile)->ctime;
-        $oldest = $ctime if $ctime < $oldest;
-        [ $modfile, $ctime ]; # save ctime for later
-    } @modfiles;
-
-    # Then we filter out any file that was created more than a
-    # few seconds after that. Process the rest.
-    my @mods;
-    for my $modfile (@modfiles) {
-        my ($mod, $ctime) = @$modfile;
-        next if $ctime - $oldest > 5; # ignore newer files
-
-        my $path = $mod;
-        $mod =~ s{[.]pm\z}{};
-        $mod =~ s{\A$libdir}{};
-        $mod =~ s{/}{::}g;
-
-        my $ver = Common::evalver($path, $mod) || q{};
-        push @mods, [ $mod, $ver ];
-    }
-
-    # Convert modules names to the dist names who provide them.
-    my %seen;
-    my @dists;
-    for my $modref (@mods) {
-        my ($mod, $ver) = @$modref;
-        my $dist = cpan_provider($mod) or next; # filter out core modules
-        next if $seen{$dist}++;                 # avoid duplicate dists
-        push @dists, [ $dist, $ver ];
-    }
-    return @dists;
-}
-
-#-----------------------------------------------------------------------------
-
-package Dist2Pkg;
-
-sub name
-{
-    my ($name) = @_;
-    my $orig = $name;
-
-    # Package names should be lowercase and consist of alphanumeric
-    # characters only (and hyphens!)...
-    $name =~ tr/A-Z/a-z/;
-    $name =~ tr/_+/-/; # _ and +'s converted to - (ie Tabbed-Text+Wrap)
-    $name =~ tr/-a-z0-9+//cd; # Delete all other chars.
-    $name =~ tr/-/-/s;
-
-    # Delete leading or trailing hyphens...
-    $name =~ s/\A-|-\z//g;
-
-    die qq{Dist. name '$orig' completely violates packaging standards}
-        unless $name;
-
-    return "perl-$name";
-}
-
-sub version
-{
-    my ($version) = @_;
-
-    # Package versions should be numbers and decimal points only...
-    $version =~ tr/-/./;
-    $version =~ tr/_0-9.-//cd;
-
-    # Remove developer versions because pacman has no special logic
-    # to compare them to regular versions like perl does.
-    $version =~ s/_[^_]+\z//;
-
-    $version =~ tr/_//d;  # delete other underscores
-    $version =~ tr/././s; # only one period at a time
-    $version =~ s/\A[.]|[.]\z//g; # shouldn't start or stop with a period
-
-    return $version;
-}
-
-#-----------------------------------------------------------------------------
-
-package main;
-
-my %CPANNAME = ('List-Util' => 'Scalar-List-Utils',
-                'Text-Tabs' => 'Text-Tabs+Wrap',
-                'Cwd'       => 'PathTools');
-
-my $perldir = shift or die "Usage: $0 [path to perl source directory]\n";
-die "$perldir is not a valid directory." unless -d $perldir;
-
-my @dists = (Dists::find($perldir), Modules::find($perldir));
-for my $dist (@dists) {
-    my $name = $dist->[0];
-    $dist->[0] = $CPANNAME{$name} if exists $CPANNAME{$name};
-}
-
-my @pkgs = map {
-    my ($name, $ver) = @$_;
-    $name = Dist2Pkg::name($name);
-    $ver  = Dist2Pkg::version($ver);
-    [ $name, $ver ];
-} @dists;
-
-@pkgs = sort { $a->[0] cmp $b->[0] } @pkgs;
-
-for my $pkg (@pkgs) {
-    my ($name, $ver) = @$pkg;
-    print "$name=$ver\n";
-}
diff --git a/staging/pidgin/PKGBUILD b/staging/pidgin/PKGBUILD
deleted file mode 100644
index acc50a562..000000000
--- a/staging/pidgin/PKGBUILD
+++ /dev/null
@@ -1,100 +0,0 @@
-# $Id: PKGBUILD 159680 2012-05-26 01:28:13Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-
-pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.4
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://pidgin.im/"
-license=('GPL')
-makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
-             'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10'
-             'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool'
-             'networkmanager')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('8fbef835c8dfa2281532ad7064d664477d72015d6dcd4345362dcfe658aaee0e')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Use Python 2
-  sed -i 's/env python$/&2/' */plugins/*.py \
-    libpurple/purple-{remote,notifications-example,url-handler}
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --disable-schemas-install \
-    --disable-meanwhile \
-    --disable-gnutls \
-    --enable-cyrus-sasl \
-    --disable-doxygen \
-    --enable-nm \
-    --with-python=/usr/bin/python2 \
-    --with-system-ssl-certs=/etc/ssl/certs
-    make
-}
-
-package_pidgin(){
-  pkgdesc="Multi-protocol instant messaging client"
-  depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
-           'gstreamer0.10' 'hicolor-icon-theme')
-  optdepends=('aspell: for spelling correction'
-              'gstreamer0.10-good-plugins: video and voice support')
-  install=pidgin.install
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  # For linking
-  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
-  make -C pidgin DESTDIR="$pkgdir" install
-  make -C doc DESTDIR="$pkgdir" install
-
-  # Remove files that are packaged in libpurle
-  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
-  install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
-
-  rm "$pkgdir/usr/share/man/man1/finch.1"
-}
-
-package_libpurple(){
-  pkgdesc="IM library extracted from Pidgin"
-  depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss')
-  optdepends=('avahi: Bonjour protocol support'
-              'ca-certificates: SSL CA certificates'
-              'dbus-python: for purple-remote and purple-url-handler'
-              'tk: Tcl/Tk scripting support')
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  for _dir in libpurple share/sounds share/ca-certs m4macros po; do
-    make -C "$_dir" DESTDIR="$pkgdir" install
-  done
-}
-
-package_finch(){
-  pkgdesc="A ncurses-based messaging client"
-  depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10')
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  # For linking
-  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
-  make -C finch DESTDIR="$pkgdir" install
-  make -C doc DESTDIR="$pkgdir" install
-
-  # Remove files that are packaged in libpurle
-  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
-  rm "$pkgdir"/usr/share/man/man1/pidgin.1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/pidgin/pidgin.install b/staging/pidgin/pidgin.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/staging/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/staging/poppler/PKGBUILD b/staging/poppler/PKGBUILD
deleted file mode 100644
index 139184dd8..000000000
--- a/staging/poppler/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 158950 2012-05-13 15:25:14Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=poppler
-pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.20.0
-pkgrel=1
-arch=(i686 x86_64)
-license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-url="http://poppler.freedesktop.org/"
-_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
-source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz
-        http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2)
-md5sums=('5bca54b9561bf5b14d9344efce2cd4f3'
-         '9dc64c254a31e570507bdd4ad4ba629a')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-
-  autoreconf -fi
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-cairo-output \
-      --enable-xpdf-headers \
-      --enable-libjpeg --enable-zlib \
-      --enable-poppler-qt4 \
-      --enable-poppler-glib
-  make
-}
-
-check() {
-  cd "${srcdir}"
-  ln -sf test-${_testtag} test
-  cd ${pkgbase}-${pkgver}
-  LANG=en_US.UTF8 make check
-}
-
-package_poppler() {
-  pkgdesc="PDF rendering library based on xpdf 3.0"
-  depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data')
-  conflicts=("poppler-qt3<${pkgver}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -e 's/^glib_subdir =.*/glib_subdir =/' \
-      -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc
-}
-
-package_poppler-glib() {
-  pkgdesc="Poppler glib bindings"
-  depends=("poppler=${pkgver}" 'glib2')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/glib"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
-  rm -f "${pkgdir}"/usr/lib/libpoppler.*
-  rm -f "${pkgdir}/usr/bin/poppler-glib-demo"
-}
-
-package_poppler-qt() {
-  pkgdesc="Poppler Qt bindings"
-  depends=("poppler=${pkgver}" 'qt')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/qt4"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
-  rm -f "${pkgdir}"/usr/lib/libpoppler.*
-}
diff --git a/staging/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch b/staging/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch
deleted file mode 100644
index 93167b79b..000000000
--- a/staging/pulseaudio/0001-Remove-usage-of-deprecated-udev_get_-_path.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 45607b113a052e4bec93a8707dc4db113c5dd100 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Sat, 26 May 2012 02:58:11 +0200
-Subject: [PATCH] Remove usage of deprecated udev_get_*_path
-
-These symbols were removed in libudev.so.1.0.0. Replace them with
-hardcoded strings.
-
-Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
----
- src/modules/module-udev-detect.c |    9 +++------
- src/modules/udev-util.c          |    4 ++--
- 2 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c
-index 1192194..31416bd 100644
---- a/src/modules/module-udev-detect.c
-+++ b/src/modules/module-udev-detect.c
-@@ -123,7 +123,7 @@ static char *card_get_sysattr(const char *card_idx, const char *name) {
-         goto finish;
-     }
- 
--    t = pa_sprintf_malloc("%s/class/sound/card%s", udev_get_sys_path(udev), card_idx);
-+    t = pa_sprintf_malloc("/sys/class/sound/card%s", card_idx);
-     card = udev_device_new_from_syspath(udev, t);
-     pa_xfree(t);
- 
-@@ -282,7 +282,7 @@ static void verify_access(struct userdata *u, struct device *d) {
-     pa_assert(u);
-     pa_assert(d);
- 
--    cd = pa_sprintf_malloc("%s/snd/controlC%s", udev_get_dev_path(u->udev), path_get_card_id(d->path));
-+    cd = pa_sprintf_malloc("/dev/snd/controlC%s", path_get_card_id(d->path));
-     accessible = access(cd, R_OK|W_OK) >= 0;
-     pa_log_debug("%s is accessible: %s", cd, pa_yes_no(accessible));
- 
-@@ -621,7 +621,6 @@ fail:
- }
- 
- static int setup_inotify(struct userdata *u) {
--    char *dev_snd;
-     int r;
- 
-     if (u->inotify_fd >= 0)
-@@ -632,9 +631,7 @@ static int setup_inotify(struct userdata *u) {
-         return -1;
-     }
- 
--    dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev));
--    r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF);
--    pa_xfree(dev_snd);
-+    r = inotify_add_watch(u->inotify_fd, "/dev/snd", IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF);
- 
-     if (r < 0) {
-         int saved_errno = errno;
-diff --git a/src/modules/udev-util.c b/src/modules/udev-util.c
-index 2f18bc4..b0bb17d 100644
---- a/src/modules/udev-util.c
-+++ b/src/modules/udev-util.c
-@@ -180,7 +180,7 @@ int pa_udev_get_info(int card_idx, pa_proplist *p) {
-         goto finish;
-     }
- 
--    t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx);
-+    t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx);
-     card = udev_device_new_from_syspath(udev, t);
-     pa_xfree(t);
- 
-@@ -277,7 +277,7 @@ char* pa_udev_get_property(int card_idx, const char *name) {
-         goto finish;
-     }
- 
--    t = pa_sprintf_malloc("%s/class/sound/card%i", udev_get_sys_path(udev), card_idx);
-+    t = pa_sprintf_malloc("/sys/class/sound/card%i", card_idx);
-     card = udev_device_new_from_syspath(udev, t);
-     pa_xfree(t);
- 
--- 
-1.7.10.2
-
diff --git a/staging/pulseaudio/PKGBUILD b/staging/pulseaudio/PKGBUILD
deleted file mode 100644
index 52965bfa8..000000000
--- a/staging/pulseaudio/PKGBUILD
+++ /dev/null
@@ -1,115 +0,0 @@
-# $Id: PKGBUILD 159684 2012-05-26 01:31:15Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgbase=pulseaudio
-pkgname=(pulseaudio libpulse)
-pkgdesc="A featureful, general-purpose sound server"
-pkgver=2.0
-pkgrel=2
-arch=(i686 x86_64)
-url="http://www.freedesktop.org/wiki/Software/PulseAudio"
-license=(GPL LGPL)
-makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
-             speex tdb udev dbus-core avahi bluez gconf intltool jack
-             lirc-utils openssl fftw orc json-c gtk2 webrtc-audio-processing
-             libsystemd)
-options=(!emptydirs !libtool)
-source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
-        pulseaudio.xinit 0001-Remove-usage-of-deprecated-udev_get_-_path.patch)
-sha256sums=('28b42edd42f4879a6884af5f0ec11801ac001eb7582881215b36649aa37e2061'
-            'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf'
-            '13e3cbe5499e462e8d818aa1faa2419aa880888ec18b4757cabbd7f5fcd6e803')
-
-build() {
-  cd $pkgbase-$pkgver
-
-  # libudev.so.1.0.0
-  patch -Np1 -i ../0001-Remove-usage-of-deprecated-udev_get_-_path.patch
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var \
-    --with-udev-rules-dir=/usr/lib/udev/rules.d \
-    --with-database=tdb \
-    --disable-hal \
-    --disable-tcpwrap \
-    --disable-rpath \
-    --disable-default-build-tests
-
-  # fight unused direct deps
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package_pulseaudio() {
-  depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb udev fftw orc
-           libsamplerate webrtc-audio-processing libsystemd)
-  optdepends=('avahi: zeroconf support'
-              'bluez: bluetooth support'
-              'gconf: configuration through gconf (paprefs)'
-              'jack: jack support'
-              'lirc-utils: infra-red support'
-              'openssl: RAOP support'
-              'python2-pyqt: Equalizer GUI (qpaeq)')
-  backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
-  install=pulseaudio.install
-
-  cd $pkgbase-$pkgver
-  make -j1 DESTDIR="$pkgdir" install
-
-  # Lower resample quality, saves CPU
-  sed -e '/resample-method/iresample-method=speex-float-0' \
-      -i "$pkgdir/etc/pulse/daemon.conf"
-
-  # Disable cork-request module, can result in e.g. media players unpausing
-  # when there's a Skype call incoming
-  sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \
-      -i "$pkgdir/usr/bin/start-pulseaudio-x11"
-
-  # Make ConsoleKit optional
-  sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \
-      -i "$pkgdir/etc/pulse/default.pa"
-
-  # Python fix
-  sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq"
-
-  install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio"
-
-  rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf"
-
-### Split libpulse
-
-  mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{lib/pulseaudio,share/man/man5}}
-
-  mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf
-
-  mv "$pkgdir"/usr/lib/libpulse{,-simple,-mainloop-glib}.so* \
-     "$srcdir/libpulse/usr/lib"
-
-  mv "$pkgdir"/usr/lib/pulseaudio/libpulsedsp.so \
-     "$pkgdir"/usr/lib/pulseaudio/libpulsecommon-*.so \
-     "$srcdir/libpulse/usr/lib/pulseaudio"
-
-  mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/cmake
-  mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig
-
-  mv {"$pkgdir","$srcdir/libpulse"}/usr/include
-
-  mv {"$pkgdir","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5
-  mv {"$pkgdir","$srcdir/libpulse"}/usr/share/vala
-}
-
-package_libpulse() {
-  pkgdesc="$pkgdesc (client library)"
-  depends=(dbus-core libasyncns libcap libxtst libsm libsndfile json-c)
-  optdepends=('alsa-plugins: ALSA support'
-              'avahi: zeroconf support')
-  backup=(etc/pulse/client.conf)
-
-  mv "$srcdir"/libpulse/* "$pkgdir"
-}
diff --git a/staging/pulseaudio/pulseaudio.install b/staging/pulseaudio/pulseaudio.install
deleted file mode 100644
index 1dc4cefb3..000000000
--- a/staging/pulseaudio/pulseaudio.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  cat << MES
->>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details
-    on configuring your system for PulseAudio.
-
->>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio.
-MES
-}
-
-post_upgrade() {
-  cat << MES
->>> If you have per-user copies of configuration files (such as client.conf,
-    daemon.conf or default.pa) in ~/.pulse/, make sure you keep them in sync
-    with changes to the packaged files in /etc/pulse/. Otherwise, PulseAudio
-    may refuse to start due to configuration errors.
-MES
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/pulseaudio/pulseaudio.xinit b/staging/pulseaudio/pulseaudio.xinit
deleted file mode 100644
index 2d30c0943..000000000
--- a/staging/pulseaudio/pulseaudio.xinit
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-case "$DESKTOP_SESSION" in
-  gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart
-  ;;
-  *)
-    # Extra checks in case DESKTOP_SESSION is not set correctly
-    if [[ -z $KDE_FULL_SESSION && -z $GNOME_DESKTOP_SESSION_ID ]]; then
-      /usr/bin/start-pulseaudio-x11
-    fi
-  ;;
-esac
diff --git a/staging/razor/PKGBUILD b/staging/razor/PKGBUILD
deleted file mode 100644
index 50d808a21..000000000
--- a/staging/razor/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 159771 2012-05-26 18:11:56Z eric $
-# Maintainer:
-# Contributor: Dale Blount <dale@archlinux.org>
-# Contributor: Manolis Tzanidakis
-
-pkgname=razor
-pkgver=2.84
-pkgrel=7
-pkgdesc="A distributed, collaborative, spam detection and filtering network"
-arch=('i686' 'x86_64')
-url="http://razor.sourceforge.net"
-license=('PerlArtistic')
-depends=('perl-net-dns' 'perl-digest-sha1' 'perl-uri' 'perl-digest-nilsimsa' 'perl')
-options=('!emptydirs')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-agents-${pkgver}.tar.bz2")
-md5sums=('8b9a11a6ce020383c32c45d1530d77c2')
-
-build() {
-  cd "${srcdir}"/${pkgname}-agents-${pkgver}
-
-  # skip install_razor_agents (we'll do the linking later)
-  # /bin/sed -i "s|install :: all pure_install doc_install install_razor_agents|install :: all pure_install doc_install|g" Makefile
-
-  perl Makefile.PL INSTALLDIRS=vendor
-  make
-}
-
-check() {
-  cd "${srcdir}"/${pkgname}-agents-${pkgver}
-  make test
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-agents-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  # cd ${pkgdir}/usr/bin
-  # for i in razor-check razor-report razor-revoke razor-admin; do 
-  #  /bin/ln -sf razor-client $i; 
-  # done
-}
diff --git a/staging/rrdtool/PKGBUILD b/staging/rrdtool/PKGBUILD
deleted file mode 100644
index 469ba4ceb..000000000
--- a/staging/rrdtool/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 159769 2012-05-26 17:51:59Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=rrdtool
-pkgver=1.4.7
-pkgrel=2
-pkgdesc="Data logging and graphing application"
-arch=('i686' 'x86_64')
-url="http://www.rrdtool.org"
-license=('GPL' 'custom')
-depends=('libxml2' 'pango' 'ttf-dejavu')
-makedepends=('intltool' 'ruby' 'python2' 'tcl' 'lua')
-optdepends=('tcl: to use corresponding binding' \
-            'python2: to use corresponding binding' \
-            'ruby: to use corresponding binding' \
-            'lua: to use corresponding binding')
-options=('!libtool' '!emptydirs' '!makeflags')
-source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz)
-sha1sums=('faab7df7696b69f85d6f89dd9708d7cf0c9a273b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby
-  sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in
-
-  PYTHON=python2 ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
-    --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \
-    --enable-ruby --enable-ruby-site-install --enable-python \
-    --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/subversion/PKGBUILD b/staging/subversion/PKGBUILD
deleted file mode 100644
index cf8ba275f..000000000
--- a/staging/subversion/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 159761 2012-05-26 15:28:27Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=subversion
-pkgver=1.7.5
-pkgrel=2
-pkgdesc="A Modern Concurrent Version Control System"
-arch=('i686' 'x86_64')
-license=('APACHE')
-depends=('neon' 'apr-util' 'sqlite' 'file')
-optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \
-            'python2: for some hook scripts') # 'ruby: for some hook scripts' 'java-environment')
-makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
-             'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
-backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
-url="http://subversion.apache.org/"
-provides=('svn')
-options=('!makeflags' '!libtool' '!emptydirs')
-source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
-        svnserve svn svnserve.conf subversion.rpath.fix.patch)
-sha1sums=('05c079762690d5ac1ccd2549742e7ef70fa45cf1'
-          'b267cba19b4f56360657a5bf5b231950e027a45a'
-          '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
-          '73b36c046c09cec2093354911c89e3ba8056af6c'
-          'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
-          '3d1e28408a9abb42af2e531adc0d01ce21acfad6')
-
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   export PYTHON=/usr/bin/python2
-
-   patch -p0 -i ../subversion.rpath.fix.patch
-   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
-
-   ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
-               --with-zlib=/usr --with-neon=/usr --with-apxs \
-               --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \
-               --enable-javahl --with-gnome-keyring --with-kwallet
-
-   make external-all
-   make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all
-   make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
-     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl # swig-rb
-}
-
-#check() {
-#   cd "${srcdir}/${pkgname}-${pkgver}"
-#   export LANG=C LC_ALL=C
-#   make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb
-#}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-
-   export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:${LD_LIBRARY_PATH}
-   make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \
-     swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
-     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
-     install install-swig-py install-swig-pl install-javahl # install-swig-rb
-
-   install -d "${pkgdir}"/usr/share/subversion
-   cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
-   rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
-
-   rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
-   rm -r "${pkgdir}"/usr/lib/perl5/core_perl
-
-   install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve
-   install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
-   install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
-
-   install -Dm 644 tools/client-side/bash_completion \
-     "${pkgdir}"/usr/share/bash-completion/completions/subversion
-   for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do
-      ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i}
-   done
-}
diff --git a/staging/subversion/subversion.rpath.fix.patch b/staging/subversion/subversion.rpath.fix.patch
deleted file mode 100644
index ba6ee9e4e..000000000
--- a/staging/subversion/subversion.rpath.fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	2009-02-16 14:10:48.000000000 -0200
-+++ Makefile.in	2009-06-04 00:56:29.000000000 -0300
-@@ -678,6 +678,7 @@
- 
- $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
- 	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
-+	cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}}
- 
- swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
-   $(SWIG_PL_DIR)/native/Makefile
diff --git a/staging/subversion/svn b/staging/subversion/svn
deleted file mode 100644
index 8988aaf63..000000000
--- a/staging/subversion/svn
+++ /dev/null
@@ -1,11 +0,0 @@
-service svn
-{
-	flags			= REUSE
-	socket_type		= stream
-	wait			= no
-	user			= root
-	server			= /usr/bin/svnserve
-	server_args		= -i
-	log_on_failure		+= USERID
-	disable			= yes
-}
diff --git a/staging/subversion/svnserve b/staging/subversion/svnserve
deleted file mode 100755
index 670fee742..000000000
--- a/staging/subversion/svnserve
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/svnserve
-
-PID=`pidof -o %PPID /usr/bin/svnserve`
-case "$1" in
-  start)
-    stat_busy "Starting svnserve"
-    if [ -z "$PID" ]; then 
-      if [ -n "$SVNSERVE_USER" ]; then
-        su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" &
-      else
-        /usr/bin/svnserve -d $SVNSERVE_ARGS &
-      fi
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon svnserve
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping svnserve"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon svnserve
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/staging/subversion/svnserve.conf b/staging/subversion/svnserve.conf
deleted file mode 100644
index 37fb7ea10..000000000
--- a/staging/subversion/svnserve.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Parameters to be passed to svnserve
-#
-#SVNSERVE_ARGS="-r /path/to/some/repos"
-SVNSERVE_ARGS=""
-
-#SVNSERVE_USER="svn"
diff --git a/staging/udisks/PKGBUILD b/staging/udisks/PKGBUILD
deleted file mode 100644
index 79fd768d9..000000000
--- a/staging/udisks/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 159757 2012-05-26 15:09:57Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=udisks
-pkgver=1.0.4
-pkgrel=4
-pkgdesc="Disk Management Service"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/udisks"
-license=('GPL')
-depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject')
-makedepends=('intltool' 'docbook-xsl')
-options=(!libtool)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/udisks --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install
-  chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh"
-  # move udev helpers and rules to /usr/lib
-  mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/
-  rm -r "${pkgdir}"/lib
-}
diff --git a/staging/usbutils/PKGBUILD b/staging/usbutils/PKGBUILD
deleted file mode 100644
index e4c32eb5a..000000000
--- a/staging/usbutils/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 159293 2012-05-20 23:41:16Z tomegun $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Tom Gundersen <teg@jklm.no>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com>
-pkgname=usbutils
-pkgver=005
-pkgrel=2
-pkgdesc="USB Device Utilities"
-arch=(i686 x86_64)
-license=('GPL')
-groups=('base')
-depends=('libusb' 'hwids')
-optdepends=('python2: for lsusb.py usage'
-            'coreutils: for lsusb.py usage')
-url="http://linux-usb.sourceforge.net/"
-# currently broken: http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        fix-python2.patch)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # patch lsusb.py to use correct usb.ids file and python2 interpreter
-  patch -Np1 -i $srcdir/fix-python2.patch
-  ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  # this is now in the hwids package
-  rm -rf $pkgdir/usr/{share/hwdata,sbin}
-}
-md5sums=('6a21f7b6c02b76df5e8a7c208d746654'
-         '45766196895b4cc50b53cd56e1bbf3d1')
diff --git a/staging/usbutils/fix-python2.patch b/staging/usbutils/fix-python2.patch
deleted file mode 100644
index 7e2875e99..000000000
--- a/staging/usbutils/fix-python2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- usbutils-002/lsusb.py	2010-12-16 01:07:09.000000000 +0100
-+++ usbutils-002/lsusb.py	2011-04-09 22:43:59.043828595 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # lsusb.py
- # Displays your USB devices in reasonable form.
- # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3.
-@@ -16,7 +16,7 @@
- warnsort = False
- 
- prefix = "/sys/bus/usb/devices/"
--usbids = "/usr/share/usb.ids"
-+usbids = "/usr/share/hwdata/usb.ids"
- 
- esc = chr(27)
- norm = esc + "[0;0m"
diff --git a/staging/util-linux/PKGBUILD b/staging/util-linux/PKGBUILD
deleted file mode 100644
index 8fa507437..000000000
--- a/staging/util-linux/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 159749 2012-05-26 12:39:32Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=util-linux
-pkgver=2.21.2
-pkgrel=1
-pkgdesc="Miscellaneous system utilities for Linux"
-url="http://www.kernel.org/pub/linux/utils/util-linux/"
-arch=('i686' 'x86_64')
-groups=('base')
-depends=('udev' 'pam')
-conflicts=('util-linux-ng')
-provides=("util-linux-ng=${pkgver}")
-license=('GPL2')
-options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.21/${pkgname}-${pkgver}.tar.xz)
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # hardware clock
-  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
-
-  ./configure --prefix=/usr \
-              --libdir=/usr/lib \
-              --enable-fs-paths-extra=/usr/bin:/usr/sbin \
-              --enable-write \
-              --enable-raw \
-              --disable-wall \
-              --enable-new-mount
-
-  make
-}
-
-check() {
-	make -C "$pkgname-$pkgver" check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  cd "${pkgdir}"
-
-  install -dm755 var/lib/hwclock
-
-  # broken tool, going away in next major release, so just remove it now
-  rm "${pkgdir}"/usr/{bin/chkdupexe,share/man/man1/chkdupexe.1}
-
-  # delete stray empty dir, fixed upstream
-  rm -r usr/share/man/ru
-}
-md5sums=('54ba880f1d66782c2287ee2c898520e9')
diff --git a/staging/vim/PKGBUILD b/staging/vim/PKGBUILD
deleted file mode 100644
index 7545d062e..000000000
--- a/staging/vim/PKGBUILD
+++ /dev/null
@@ -1,216 +0,0 @@
-# $Id: PKGBUILD 159453 2012-05-24 13:34:26Z tdziedzic $
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Maintainer: tobias [ tobias at archlinux org ]
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgbase=vim
-pkgname=('vim' 'gvim' 'vim-runtime')
-_topver=7.3
-_patchlevel=515
-__hgrev=8201108e9cf0
-_versiondir="vim${_topver//./}"
-pkgver=${_topver}.${_patchlevel}
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('custom:vim')
-url="http://www.vim.org"
-makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
-source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig"
-        'pythoncomplete.vim::http://www.vim.org/scripts/download_script.php?src_id=10872'
-        'vimrc'
-        'archlinux.vim'
-        'gvim.desktop')
-sha1sums=('10d7642d5062effdb51f53952622f9338003bbbf'
-          '0c1c584c1a2a2a279507f793cd5eff82863c625b'
-          '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
-          '3494baf53a63581ba69f86a81293640ff681c5c5'
-          '25dd3c2ce436e73a367c8f73b68f7f6889682437'
-          '4a579cf66590d711f49c5dfb4a25e5df116ff7ba')
-
-# source PKGBUILD && mksource
-mksource() {
-
-  [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1)
-
-  __hgroot='http://vim.googlecode.com/hg/'
-  __hgrepo='vim'
-  __hgbranch='default'
-
-  hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo}
-
-  pushd ${__hgrepo}
-  if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then
-    printf 'You are not building the latest revision!\n'
-    printf "Consider updating __hgrev to $(hg id -r ${__hgbranch}).\n"
-  fi
-  popd
-
-  mv vim ${pkgname}-${pkgver}
-  find ${pkgname}-${pkgver} -depth -type d -name .hg -exec rm -rf {} \;
-  rm ${pkgname}-${pkgver}/{.hgignore,.hgtags}
-  tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
-  rm -r ${pkgname}-${pkgver}
-  #gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
-}
-
-build() {
-  # remove -O2 because there is a crash with python because of it
-  # fedora br: https://bugzilla.redhat.com/show_bug.cgi?id=817196
-  export CFLAGS="${CFLAGS/-O2 /}"
-
-  cd "${srcdir}"
-
-  cp -a ${pkgname}-${pkgver} vim-build
-
-  # define the place for the global (g)vimrc file (set to /etc/vimrc)
-  sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \
-    vim-build/src/feature.h
-  sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \
-    vim-build/src/feature.h
-  # fix python name
-  sed -i -e 's|vi_cv_path_python, python|vi_cv_path_python, python2|' \
-    vim-build/src/configure.in
-  (cd vim-build/src && autoconf)
-
-  cp -a vim-build gvim-build
-
-  cd "${srcdir}"/vim-build
-
-  ./configure --prefix=/usr --localstatedir=/var/lib/vim \
-    --with-features=big --with-compiledby=ArchLinux \
-    --enable-gpm --enable-acl --with-x=no \
-    --disable-gui --enable-multibyte --enable-cscope \
-    --disable-netbeans --enable-perlinterp --disable-pythoninterp \
-    --disable-python3interp --disable-rubyinterp --disable-luainterp
-
-  make
-
-  cd "${srcdir}"/gvim-build
-
-  ./configure --prefix=/usr --localstatedir=/var/lib/vim \
-    --with-features=big --with-compiledby=ArchLinux \
-    --enable-gpm --enable-acl --with-x=yes \
-    --enable-gui=gtk2 --enable-multibyte --enable-cscope \
-    --enable-netbeans --enable-perlinterp --enable-pythoninterp \
-    --disable-python3interp --enable-rubyinterp --enable-luainterp
-
-  make
-}
-
-check() {
-  # disable tests because they seem to freeze
-
-  cd "${srcdir}"/vim-build
-
-  #make test
-
-  cd "${srcdir}"/gvim-build
-
-  #make test
-}
-
-package_vim() {
-  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm')
-  conflicts=('gvim')
-
-  cd "${srcdir}"/vim-build
-  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
-
-  # provided by (n)vi in core
-  rm "${pkgdir}"/usr/bin/{ex,view}
-
-  # delete some manpages
-  find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
-    while read _mandir; do
-    cd ${_mandir}
-    rm -f ex.1 view.1 # provided by (n)vi
-    rm -f evim.1    # this does not make sense if we have no GUI
-  done
-
-  # Runtime provided by runtime package
-  rm -r "${pkgdir}"/usr/share/vim
-
-  # license
-  install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
-}
-
-package_gvim() {
-  pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)'
-  depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt'
-           'desktop-file-utils' 'gtk2' 'lua' 'python2')
-  provides=("vim=${pkgver}-${pkgrel}")
-  conflicts=('vim')
-  install=gvim.install
-
-  cd "${srcdir}"/gvim-build
-  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
-
-  # provided by (n)vi in core
-  rm "${pkgdir}"/usr/bin/{ex,view}
-
-  # delete some manpages
-  find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \
-    while read _mandir; do
-    cd ${_mandir}
-    rm -f ex.1 view.1 # provided by (n)vi
-  done
-
-  # Move the runtime for later packaging
-  mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install
-
-  # freedesktop links
-  install -Dm644 "${srcdir}"/gvim.desktop \
-    "${pkgdir}"/usr/share/applications/gvim.desktop
-  install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png
-
-  # license
-   install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt
-}
-
-package_vim-runtime() {
-  pkgdesc='Runtime for vim and gvim'
-  depends=('perl' 'gawk')
-  backup=('etc/vimrc')
-
-  # Install the runtime split from gvim
-  install -dm755 "${pkgdir}"/usr/share
-  mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim
-
-  # Don't forget logtalk.dict
-  install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \
-    "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
-
-  # fix FS#17216
-  sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \
-    "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
-
-  # patch filetype.vim for better handling of pacman related files
-  sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \
-    "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
-  sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \
-    "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim
-
-  # make Aaron happy
-  install -Dm644 "${srcdir}"/pythoncomplete.vim \
-    "${pkgdir}"/usr/share/vim/${_versiondir}/autoload/pythoncomplete.vim
-  
-  # rc files
-  install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
-  install -Dm644 "${srcdir}"/archlinux.vim \
-    "${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim
-
-  # rgb.txt file
-  install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \
-    "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt
-
-  # license
-  install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime
-  ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
-    "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt
-}
-
-# vim:set sw=2 sts=2 et:
diff --git a/staging/vim/archlinux.vim b/staging/vim/archlinux.vim
deleted file mode 100644
index 148bb930f..000000000
--- a/staging/vim/archlinux.vim
+++ /dev/null
@@ -1,26 +0,0 @@
-" The ArchLinux global vimrc - setting only a few sane defaults
-"
-" Maintainer:      Tobias Kieslich [tobias funnychar archlinux dot org]
-"
-" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION
-" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc
-
-" Normally we use vim-extensions. If you want true vi-compatibility
-" remove change the following statements
-set nocompatible                " Use Vim defaults instead of 100% vi compatibility
-set backspace=indent,eol,start  " more powerful backspacing
-
-" Now we set some defaults for the editor
-set history=50                  " keep 50 lines of command line history
-set ruler                       " show the cursor position all the time
-
-" Suffixes that get lower priority when doing tab completion for filenames.
-" These are files we are not likely to want to edit or read.
-set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc
-
-
-if has('gui_running')
-  " Make shift-insert work like in Xterm
-  map <S-Insert> <MiddleMouse>
-  map! <S-Insert> <MiddleMouse>
-endif
diff --git a/staging/vim/gvim.desktop b/staging/vim/gvim.desktop
deleted file mode 100644
index 675357da5..000000000
--- a/staging/vim/gvim.desktop
+++ /dev/null
@@ -1,63 +0,0 @@
-[Desktop Entry]
-Name=Vi IMproved
-Name[bg]=Vi Ðåäàêòîð
-Name[ca]=Vi Millorat
-Name[da]=Vi forbedret
-Name[eo]=VIM
-Name[et]=Täiustatud Vi (vim)
-Name[fr]=Vi étendu (VIM)
-Name[he]=רפושמ Vi
-Name[hu]=Vi
-Name[is]=Vi IMproved ritillinn
-Name[it]=Vi iMproved
-Name[no]=Vi IMproved (forbedret VI)
-Name[pl]=Poprawiony VI (vim)
-Name[ro]=VIM
-Name[ru]=Улучшенный VI
-Name[sk]=Vi IMpreved
-Name[sl]=Izboljšani vi (vim)
-Name[sv]=Förbättrad Vi
-Name[zh_CN.GB2312]=改进的 Vi
-Comment=Powerful text editor with scripting functions and macro recorder
-Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè
-Comment[ca]=Editor vi potent
-Comment[cs]=Mocný textový editor vi
-Comment[da]=En kraftig vi tekstbehandler
-Comment[de]=Ein leistungsfähiger vi-Editor
-Comment[el]=Πανίσχυρος διορθωτής vi
-Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn
-Comment[es]=Una versión mejorada del editor vi
-Comment[et]=Võimas tekstiredaktor vi
-Comment[fi]=Tehokas vi-tekstieditori
-Comment[fr]=Éditeur vi puissant
-Comment[gl]=Potente editor vi
-Comment[he]=Vi המצועה בר ךרועה
-Comment[hr]=Napredni vi uređivač
-Comment[hu]=Vi szövegszerkesztő
-Comment[is]=Öflug útgáfa vi ritilsins
-Comment[it]=Un editor vi potenziato
-Comment[ja]=強力なViエディタ
-Comment[lt]=Galingas vi redaktorius
-Comment[mk]=Моќен VI уредувач
-Comment[nl]=Krachtige vi-editor
-Comment[no]=En kraftig vi-redigerer
-Comment[no_NY]=Kraftig vi-tekstredigeringsprogram
-Comment[pl]=Edytor vi
-Comment[pt]=Um poderoso editor de texto
-Comment[ro]=Un editor de texte VI, puternic
-Comment[ru]=Мощный текстовый редактор vi
-Comment[sk]=Silný textový procesor vi
-Comment[sl]=Zmogljivi urejevalnik vi
-Comment[sr]=Moćni vi editor
-Comment[sv]=En kraftfull texteditor
-Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷
-Comment[tr]=Güçlü vi düzenleyicisi
-Comment[uk]=Потужний редактор vi
-Comment[zh_CN.GB2312]=功能强大的 vi 编辑器
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=gvim -f %F
-Icon=gvim
-Type=Application
-Terminal=false
-X-XClassHintResName=VIM
-Categories=Utility;TextEditor;
diff --git a/staging/vim/gvim.install b/staging/vim/gvim.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/staging/vim/gvim.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/staging/vim/vimrc b/staging/vim/vimrc
deleted file mode 100644
index 92d3ff980..000000000
--- a/staging/vim/vimrc
+++ /dev/null
@@ -1,16 +0,0 @@
-" All system-wide defaults are set in $VIMRUNTIME/archlinux.vim (usually just
-" /usr/share/vim/vimfiles/archlinux.vim) and sourced by the call to :runtime
-" you can find below.  If you wish to change any of those settings, you should
-" do it in this file (/etc/vimrc), since archlinux.vim will be overwritten
-" everytime an upgrade of the vim packages is performed.  It is recommended to
-" make changes after sourcing archlinux.vim since it alters the value of the
-" 'compatible' option.
-
-" This line should not be removed as it ensures that various options are
-" properly set to work with the Vim-related packages.
-runtime! archlinux.vim
-
-" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim'
-" Or better yet, read /usr/share/vim/vim72/vimrc_example.vim or the vim manual
-" and configure vim to your own liking!
-
diff --git a/staging/vlc/PKGBUILD b/staging/vlc/PKGBUILD
deleted file mode 100644
index 9c48c6b9f..000000000
--- a/staging/vlc/PKGBUILD
+++ /dev/null
@@ -1,88 +0,0 @@
-# $Id: PKGBUILD 159698 2012-05-26 06:51:40Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
-
-pkgname=vlc
-pkgver=2.0.1
-pkgrel=2
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('LGPL2.1' 'GPL2')
-depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' 
-         'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' 
-         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 
-         'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' 
-         'xcb-util-keysyms' 'ttf-freefont')
-makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
-             'fluidsynth' 'libdc1394' 'libavc1394' 'lirc-utils'
-             'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd'
-             'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss'
-             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager')
-optdepends=('avahi: for service discovery using bonjour protocol'
-            'libnotify: for notification plugin'
-            'ncurses: for ncurses interface support'
-            'libdvdcss: for decoding encrypted DVDs'
-            'lirc-utils: for lirc plugin'
-            'libavc1394: for devices using the 1394ta AV/C'
-            'libdc1394: for IEEE 1394 plugin'
-            'kdelibs: KDE Solid hardware integration'
-            'vdpau-video: vdpau back-end for nvidia'
-            'libva-driver-intel: back-end for intel cards'
-            'libbluray: for Blu-Ray support'
-            'flac: for Free Lossless Audio Codec plugin'
-            'oss: for OSS audio support'
-            'portaudio: for portaudio support'
-            'twolame: for TwoLAME mpeg2 encoder plugin'
-            'projectm: for ProjectM visualisation plugin'
-            'libcaca: for colored ASCII art video output'
-            'libgme: for libgme plugin'
-            'librsvg: for SVG plugin'
-            'gnome-vfs: for GNOME Virtual File System support'
-            'libgoom2: for libgoom plugin'
-            'vcdimager: navigate VCD with libvcdinfo'
-            'xosd: for xosd support'
-            'aalib: for ASCII art plugin'
-            'libmtp: for MTP devices support'
-            'fluidsynth: for synthesizer MIDI FluidSynth'
-            'smbclient: for SMB access plugin')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-backup=('usr/share/vlc/lua/http/.hosts'
-        'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!libtool' '!emptydirs')
-install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('5ad114755670e4881a2b35354e2f79bc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
-
-  ./configure --prefix=/usr \
-              --disable-rpath \
-              --enable-oss \
-              --enable-faad \
-              --enable-nls \
-              --enable-lirc \
-              --enable-pvr \
-              --enable-ncurses \
-              --enable-realrtsp \
-              --enable-xosd \
-              --enable-aa \
-              --enable-vcdx
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  for res in 16 32 48 128; do
-    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
-        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
-  done
-}
diff --git a/staging/vlc/vlc.install b/staging/vlc/vlc.install
deleted file mode 100644
index dc4961cae..000000000
--- a/staging/vlc/vlc.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/vlc/plugins/plugins-*.dat
-}
-
-post_remove() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
diff --git a/staging/weechat/PKGBUILD b/staging/weechat/PKGBUILD
deleted file mode 100644
index 70b5ad435..000000000
--- a/staging/weechat/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 159476 2012-05-24 21:06:54Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: lucke <lucke at o2 dot pl>
-
-pkgname=weechat
-pkgver=0.3.7
-pkgrel=2
-pkgdesc="Fast, light and extensible IRC client (curses UI)"
-arch=('i686' 'x86_64')
-url="http://www.weechat.org/"
-license=('GPL')
-depends=('gnutls' 'curl' 'libgcrypt')
-makedepends=('cmake' 'pkgconfig' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell')
-optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell')
-options=('!libtool')
-source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('62bb5002b2ba9e5816dfeededc3fa276')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  mkdir build
-  cd build
-  cmake .. -DPREFIX=/usr \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-        -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-
-  make DESTDIR="${pkgdir}/" install
-}
diff --git a/staging/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch b/staging/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch
deleted file mode 100644
index bcfbf94db..000000000
--- a/staging/xf86-video-ati/0000-poor-man-s-solid-picture-support-for-r300-r600.patch
+++ /dev/null
@@ -1,571 +0,0 @@
-From 837149c63929d7d5a8ef6f8204d396f8e6d5acd7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@daenzer.net>
-Date: Fri, 13 Apr 2012 11:12:51 +0200
-Subject: [PATCH 1/4] Poor man's acceleration of solid pictures for R3xx-R7xx
-
-The patch below implements basic acceleration of solid pictures via
-scratch 1x1 pixmaps. It seems to at least alleviate some of the
-corruption and performance issues exposed by Cairo 1.12, and should also
-improve performance for other toolkits/apps using solid pictures.
-
-If there are no objections to this approach, maybe someone else can beat
-me to extending this for Evergreen+ and R1/2xx.
----
- src/r600_exa.c          |  160 ++++++++++++++++++++++++++--------------------
- src/radeon_exa_render.c |  115 ++++++++++++++++++++--------------
- src/radeon_exa_shared.c |   19 ++++++
- src/radeon_exa_shared.h |    1 +
- 4 files changed, 179 insertions(+), 116 deletions(-)
-
-diff --git a/src/r600_exa.c b/src/r600_exa.c
-index e1eb62f..c3ae553 100644
---- a/src/r600_exa.c
-+++ b/src/r600_exa.c
-@@ -901,17 +901,8 @@ static Bool R600CheckCompositeTexture(PicturePtr pPict,
- 				      int op,
- 				      int unit)
- {
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-     unsigned int i;
--    int max_tex_w, max_tex_h;
--
--    max_tex_w = 8192;
--    max_tex_h = 8192;
--
--    if ((w > max_tex_w) || (h > max_tex_h))
--	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
- 
-     for (i = 0; i < sizeof(R600TexFormats) / sizeof(R600TexFormats[0]); i++) {
- 	if (R600TexFormats[i].fmt == pPict->format)
-@@ -951,9 +942,7 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
-     ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-     struct radeon_accel_state *accel_state = info->accel_state;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    unsigned int repeatType;
-     unsigned int i;
-     tex_resource_t  tex_res;
-     tex_sampler_t   tex_samp;
-@@ -969,9 +958,16 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
-     }
- 
-     /* Texture */
-+    if (pPict->pDrawable) {
-+	tex_res.w               = pPict->pDrawable->width;
-+	tex_res.h               = pPict->pDrawable->height;
-+	repeatType              = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    } else {
-+	tex_res.w               = 1;
-+	tex_res.h               = 1;
-+	repeatType              = RepeatNormal;
-+    }
-     tex_res.id                  = unit;
--    tex_res.w                   = w;
--    tex_res.h                   = h;
-     tex_res.pitch               = accel_state->src_obj[unit].pitch;
-     tex_res.depth               = 0;
-     tex_res.dim                 = SQ_TEX_DIM_2D;
-@@ -1170,24 +1166,24 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
- 	vs_alu_consts[0] = xFixedToFloat(pPict->transform->matrix[0][0]);
- 	vs_alu_consts[1] = xFixedToFloat(pPict->transform->matrix[0][1]);
- 	vs_alu_consts[2] = xFixedToFloat(pPict->transform->matrix[0][2]);
--	vs_alu_consts[3] = 1.0 / w;
-+	vs_alu_consts[3] = 1.0 / tex_res.w;
- 
- 	vs_alu_consts[4] = xFixedToFloat(pPict->transform->matrix[1][0]);
- 	vs_alu_consts[5] = xFixedToFloat(pPict->transform->matrix[1][1]);
- 	vs_alu_consts[6] = xFixedToFloat(pPict->transform->matrix[1][2]);
--	vs_alu_consts[7] = 1.0 / h;
-+	vs_alu_consts[7] = 1.0 / tex_res.h;
-     } else {
- 	accel_state->is_transform[unit] = FALSE;
- 
- 	vs_alu_consts[0] = 1.0;
- 	vs_alu_consts[1] = 0.0;
- 	vs_alu_consts[2] = 0.0;
--	vs_alu_consts[3] = 1.0 / w;
-+	vs_alu_consts[3] = 1.0 / tex_res.w;
- 
- 	vs_alu_consts[4] = 0.0;
- 	vs_alu_consts[5] = 1.0;
- 	vs_alu_consts[6] = 0.0;
--	vs_alu_consts[7] = 1.0 / h;
-+	vs_alu_consts[7] = 1.0 / tex_res.h;
-     }
- 
-     /* VS alu constants */
-@@ -1202,33 +1198,30 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
- {
-     uint32_t tmp1;
-     PixmapPtr pSrcPixmap, pDstPixmap;
--    int max_tex_w, max_tex_h, max_dst_w, max_dst_h;
- 
-     /* Check for unsupported compositing operations. */
-     if (op >= (int) (sizeof(R600BlendOp) / sizeof(R600BlendOp[0])))
- 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
- 
--    if (!pSrcPicture->pDrawable)
--	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
-+    if (pSrcPicture->pDrawable) {
-+	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
- 
--    max_tex_w = 8192;
--    max_tex_h = 8192;
--    max_dst_w = 8192;
--    max_dst_h = 8192;
-+	if (pSrcPixmap->drawable.width >= 8192 ||
-+	    pSrcPixmap->drawable.height >= 8192) {
-+	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
-+			     pSrcPixmap->drawable.width,
-+			     pSrcPixmap->drawable.height));
-+	}
- 
--    if (pSrcPixmap->drawable.width >= max_tex_w ||
--	pSrcPixmap->drawable.height >= max_tex_h) {
--	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
--			 pSrcPixmap->drawable.width,
--			 pSrcPixmap->drawable.height));
--    }
-+	if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
-+	    return FALSE;
-+    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
- 
-     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
- 
--    if (pDstPixmap->drawable.width >= max_dst_w ||
--	pDstPixmap->drawable.height >= max_dst_h) {
-+    if (pDstPixmap->drawable.width >= 8192 ||
-+	pDstPixmap->drawable.height >= 8192) {
- 	RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n",
- 			 pDstPixmap->drawable.width,
- 			 pDstPixmap->drawable.height));
-@@ -1237,38 +1230,35 @@ static Bool R600CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
-     if (pMaskPicture) {
- 	PixmapPtr pMaskPixmap;
- 
--	if (!pMaskPicture->pDrawable)
--	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
-+	if (pMaskPicture->pDrawable) {
-+	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
- 
--	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
--
--	if (pMaskPixmap->drawable.width >= max_tex_w ||
--	    pMaskPixmap->drawable.height >= max_tex_h) {
--	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
--			     pMaskPixmap->drawable.width,
--			     pMaskPixmap->drawable.height));
--	}
-+	    if (pMaskPixmap->drawable.width >= 8192 ||
-+		pMaskPixmap->drawable.height >= 8192) {
-+	      RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
-+			       pMaskPixmap->drawable.width,
-+			       pMaskPixmap->drawable.height));
-+	    }
- 
--	if (pMaskPicture->componentAlpha) {
--	    /* Check if it's component alpha that relies on a source alpha and
--	     * on the source value.  We can only get one of those into the
--	     * single source value that we get to blend with.
--	     */
--	    if (R600BlendOp[op].src_alpha &&
--		(R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
--		(BLEND_ZERO << COLOR_SRCBLEND_shift)) {
--		RADEON_FALLBACK(("Component alpha not supported with source "
--				 "alpha and source value blending.\n"));
-+	    if (pMaskPicture->componentAlpha) {
-+		/* Check if it's component alpha that relies on a source alpha and
-+		 * on the source value.  We can only get one of those into the
-+		 * single source value that we get to blend with.
-+		 */
-+		if (R600BlendOp[op].src_alpha &&
-+		    (R600BlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
-+		    (BLEND_ZERO << COLOR_SRCBLEND_shift)) {
-+		    RADEON_FALLBACK(("Component alpha not supported with source "
-+				     "alpha and source value blending.\n"));
-+		}
- 	    }
--	}
- 
--	if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
--	    return FALSE;
-+	    if (!R600CheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
-+		return FALSE;
-+	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
-     }
- 
--    if (!R600CheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
--	return FALSE;
--
-     if (!R600GetDestFormat(pDstPicture, &tmp1))
- 	return FALSE;
- 
-@@ -1280,7 +1270,8 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
- 				 PicturePtr pMaskPicture, PicturePtr pDstPicture,
- 				 PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-     struct radeon_accel_state *accel_state = info->accel_state;
-     uint32_t dst_format;
-@@ -1288,15 +1279,21 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
-     shader_config_t vs_conf, ps_conf;
-     struct r600_accel_object src_obj, mask_obj, dst_obj;
- 
--    if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8)
-+    if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8))
- 	return FALSE;
- 
-+    if (!pSrc) {
-+	pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color);
-+	if (!pSrc)
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+    }
-+
- #if defined(XF86DRM_MODE)
-     if (info->cs) {
- 	src_obj.offset = 0;
- 	dst_obj.offset = 0;
--	src_obj.bo = radeon_get_pixmap_bo(pSrc);
- 	dst_obj.bo = radeon_get_pixmap_bo(pDst);
-+	src_obj.bo = radeon_get_pixmap_bo(pSrc);
- 	dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst);
- 	src_obj.tiling_flags = radeon_get_pixmap_tiling(pSrc);
- 	dst_obj.surface = radeon_get_pixmap_surface(pDst);
-@@ -1322,7 +1319,16 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
-     dst_obj.bpp = pDst->drawable.bitsPerPixel;
-     dst_obj.domain = RADEON_GEM_DOMAIN_VRAM;
- 
--    if (pMask) {
-+    if (pMaskPicture) {
-+	if (!pMask) {
-+	    pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color);
-+	    if (!pMask) {
-+		if (!pSrcPicture->pDrawable)
-+		    pScreen->DestroyPixmap(pSrc);
-+		RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+	    }
-+	}
-+
- #if defined(XF86DRM_MODE)
- 	if (info->cs) {
- 	    mask_obj.offset = 0;
-@@ -1509,11 +1515,9 @@ static Bool R600PrepareComposite(int op, PicturePtr pSrcPicture,
-     return TRUE;
- }
- 
--static void R600DoneComposite(PixmapPtr pDst)
-+static void R600FinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst,
-+				struct radeon_accel_state *accel_state)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
--    RADEONInfoPtr info = RADEONPTR(pScrn);
--    struct radeon_accel_state *accel_state = info->accel_state;
-     int vtx_size;
- 
-     if (accel_state->vsync)
-@@ -1527,6 +1531,22 @@ static void R600DoneComposite(PixmapPtr pDst)
-     r600_finish_op(pScrn, vtx_size);
- }
- 
-+static void R600DoneComposite(PixmapPtr pDst)
-+{
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    RADEONInfoPtr info = RADEONPTR(pScrn);
-+    struct radeon_accel_state *accel_state = info->accel_state;
-+
-+    R600FinishComposite(pScrn, pDst, accel_state);
-+
-+    if (!accel_state->src_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->src_pix);
-+
-+    if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->msk_pix);
-+}
-+
- static void R600Composite(PixmapPtr pDst,
- 			  int srcX, int srcY,
- 			  int maskX, int maskY,
-@@ -1543,7 +1563,7 @@ static void R600Composite(PixmapPtr pDst,
- 
- #ifdef XF86DRM_MODE
-     if (info->cs && CS_FULL(info->cs)) {
--	R600DoneComposite(info->accel_state->dst_pix);
-+	R600FinishComposite(pScrn, pDst, info->accel_state);
- 	radeon_cs_flush_indirect(pScrn);
- 	R600PrepareComposite(info->accel_state->composite_op,
- 			     info->accel_state->src_pic,
-diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
-index e5c231f..b6cc9e4 100644
---- a/src/radeon_exa_render.c
-+++ b/src/radeon_exa_render.c
-@@ -299,8 +299,8 @@ static Bool RADEONSetupSourceTile(PicturePtr pPict,
-     if (repeatType == RepeatNormal || repeatType == RepeatReflect) {
- 	Bool badPitch = needMatchingPitch && !RADEONPitchMatches(pPix);
- 	
--	int w = pPict->pDrawable->width;
--	int h = pPict->pDrawable->height;
-+	int w = pPict->pDrawable ? pPict->pDrawable->width : 1;
-+	int h = pPict->pDrawable ? pPict->pDrawable->height : 1;
- 	
- 	if (pPict->transform) {
- 	    if (badPitch)
-@@ -1112,23 +1112,8 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict,
-     ScreenPtr pScreen = pDstPict->pDrawable->pScreen;
-     ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
--
-     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     int i;
--    int max_tex_w, max_tex_h;
--
--    if (is_r500) {
--	max_tex_w = 4096;
--	max_tex_h = 4096;
--    } else {
--	max_tex_w = 2048;
--	max_tex_h = 2048;
--    }
--
--    if ((w > max_tex_w) || (h > max_tex_h))
--	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
- 
-     for (i = 0; i < sizeof(R300TexFormats) / sizeof(R300TexFormats[0]); i++)
-     {
-@@ -1139,7 +1124,7 @@ static Bool R300CheckCompositeTexture(PicturePtr pPict,
- 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
- 			 (int)pPict->format));
- 
--    if (!RADEONCheckTexturePOT(pPict, unit == 0)) {
-+    if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0)) {
- 	if (info->cs) {
-     		struct radeon_exa_pixmap_priv *driver_priv;
- 		PixmapPtr pPix;
-@@ -1181,15 +1166,23 @@ static Bool FUNC_NAME(R300TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
- {
-     RINFO_FROM_SCREEN(pPix->drawable.pScreen);
-     uint32_t txfilter, txformat0, txformat1, txoffset, txpitch, us_format = 0;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-+    int w, h;
-     int i, pixel_shift, out_size = 6;
--    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    unsigned int repeatType;
-     struct radeon_exa_pixmap_priv *driver_priv;
-     ACCEL_PREAMBLE();
- 
-     TRACE;
- 
-+    if (pPict->pDrawable) {
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+	repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    } else {
-+	w = h = 1;
-+	repeatType = RepeatNormal;
-+    }
-+
-     txpitch = exaGetPixmapPitch(pPix);
-     txoffset = 0;
- 
-@@ -1394,11 +1387,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
-     if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
- 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
- 
--    if (!pSrcPicture->pDrawable)
--	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
--
-     if (IS_R500_3D) {
- 	max_tex_w = 4096;
- 	max_tex_h = 4096;
-@@ -1416,13 +1404,6 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
- 	}
-     }
- 
--    if (pSrcPixmap->drawable.width > max_tex_w ||
--	pSrcPixmap->drawable.height > max_tex_h) {
--	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
--			 pSrcPixmap->drawable.width,
--			 pSrcPixmap->drawable.height));
--    }
--
-     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
- 
-     if (pDstPixmap->drawable.width > max_dst_w ||
-@@ -1432,20 +1413,32 @@ static Bool R300CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
- 			 pDstPixmap->drawable.height));
-     }
- 
-+    if (pSrcPicture->pDrawable) {
-+	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
-+
-+	if (pSrcPixmap->drawable.width > max_tex_w ||
-+	    pSrcPixmap->drawable.height > max_tex_h) {
-+	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
-+			     pSrcPixmap->drawable.width,
-+			     pSrcPixmap->drawable.height));
-+	}
-+    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
-+
-     if (pMaskPicture) {
- 	PixmapPtr pMaskPixmap;
- 
--	if (!pMaskPicture->pDrawable)
--	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
-+	if (pMaskPicture->pDrawable) {
-+	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
- 
--	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
--
--	if (pMaskPixmap->drawable.width > max_tex_w ||
--	    pMaskPixmap->drawable.height > max_tex_h) {
--	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
--			     pMaskPixmap->drawable.width,
--			     pMaskPixmap->drawable.height));
--	}
-+	    if (pMaskPixmap->drawable.width > max_tex_w ||
-+		pMaskPixmap->drawable.height > max_tex_h) {
-+	      RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
-+			       pMaskPixmap->drawable.width,
-+			       pMaskPixmap->drawable.height));
-+	    }
-+	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
- 
- 	if (pMaskPicture->componentAlpha) {
- 	    /* Check if it's component alpha that relies on a source alpha and
-@@ -1479,7 +1472,8 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
- 				PicturePtr pMaskPicture, PicturePtr pDstPicture,
- 				PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
--    RINFO_FROM_SCREEN(pDst->drawable.pScreen);
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    RINFO_FROM_SCREEN(pScreen);
-     uint32_t dst_format, dst_pitch;
-     uint32_t txenable, colorpitch;
-     uint32_t blendcntl, output_fmt;
-@@ -1508,9 +1502,24 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
-     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
- 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
- 
-+    if (!pSrc) {
-+	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
-+	if (!pSrc)
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+    }
-+
-     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, TRUE, FALSE))
- 	return FALSE;
- 
-+    if (pMaskPicture && !pMask) {
-+	pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
-+	if (!pMask) {
-+	    if (!pSrcPicture->pDrawable)
-+		pScreen->DestroyPixmap(pSrc);
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+	}
-+    }
-+
-     RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture,
- 			     pSrc, pMask, pDst);
- 
-@@ -2132,7 +2141,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
-     return TRUE;
- }
- 
--static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
-+static void FUNC_NAME(RadeonFinishComposite)(PixmapPtr pDst)
- {
-     RINFO_FROM_SCREEN(pDst->drawable.pScreen);
-     ACCEL_PREAMBLE();
-@@ -2179,6 +2188,20 @@ static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
-     LEAVE_DRAW(0);
- }
- 
-+static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
-+{
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    RINFO_FROM_SCREEN(pScreen);
-+    struct radeon_accel_state *accel_state = info->accel_state;
-+
-+    FUNC_NAME(RadeonFinishComposite)(pDst);
-+
-+    if (!accel_state->src_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->src_pix);
-+
-+    if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->msk_pix);
-+}
- 
- #ifdef ACCEL_CP
- 
-@@ -2257,7 +2280,7 @@ static void FUNC_NAME(RadeonCompositeTile)(ScrnInfoPtr pScrn,
-     if ((info->cs && CS_FULL(info->cs)) ||
- 	(!info->cs && (info->cp->indirectBuffer->used + 4 * 32) >
- 	 info->cp->indirectBuffer->total)) {
--	FUNC_NAME(RadeonDoneComposite)(info->accel_state->dst_pix);
-+	FUNC_NAME(RadeonFinishComposite)(info->accel_state->dst_pix);
- 	if (info->cs)
- 	    radeon_cs_flush_indirect(pScrn);
- 	else
-diff --git a/src/radeon_exa_shared.c b/src/radeon_exa_shared.c
-index be1d2fa..28dc335 100644
---- a/src/radeon_exa_shared.c
-+++ b/src/radeon_exa_shared.c
-@@ -126,6 +126,25 @@ Bool RADEONCheckBPP(int bpp)
- 	return FALSE;
- }
- 
-+PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid)
-+{
-+    PixmapPtr pPix = pScreen->CreatePixmap(pScreen, 1, 1, 32, 0);
-+    struct radeon_bo *bo;
-+
-+    exaMoveInPixmap(pPix);
-+    bo = radeon_get_pixmap_bo(pPix);
-+
-+    if (radeon_bo_map(bo, 1)) {
-+	pScreen->DestroyPixmap(pPix);
-+	return NULL;
-+    }
-+
-+    memcpy(bo->ptr, &solid, 4);
-+    radeon_bo_unmap(bo);
-+
-+    return pPix;
-+}
-+
- static Bool radeon_vb_get(ScrnInfoPtr pScrn)
- {
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-diff --git a/src/radeon_exa_shared.h b/src/radeon_exa_shared.h
-index 7b8b5ca..60a1045 100644
---- a/src/radeon_exa_shared.h
-+++ b/src/radeon_exa_shared.h
-@@ -40,6 +40,7 @@ extern void RADEONVlineHelperClear(ScrnInfoPtr pScrn);
- extern void RADEONVlineHelperSet(ScrnInfoPtr pScrn, int x1, int y1, int x2, int y2);
- extern Bool RADEONValidPM(uint32_t pm, int bpp);
- extern Bool RADEONCheckBPP(int bpp);
-+extern PixmapPtr RADEONSolidPixmap(ScreenPtr pScreen, uint32_t solid);
- 
- #define RADEON_TRACE_FALL 0
- #define RADEON_TRACE_DRAW 0
--- 
-1.7.7.5
-
diff --git a/staging/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch b/staging/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch
deleted file mode 100644
index e6b5433e1..000000000
--- a/staging/xf86-video-ati/0001-poor-man-s-solid-picture-support-for-evergreen.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From 761ef4b340e689490a76ec5ce520c858335e2106 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Sat, 14 Apr 2012 08:53:39 -0400
-Subject: [PATCH] poor man's solid picture support for evergreen
-
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- src/evergreen_exa.c |  163 ++++++++++++++++++++++++++++++---------------------
- 1 files changed, 95 insertions(+), 68 deletions(-)
-
-diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c
-index cee3ec2..61b47a4 100644
---- a/src/evergreen_exa.c
-+++ b/src/evergreen_exa.c
-@@ -748,17 +748,8 @@ static Bool EVERGREENCheckCompositeTexture(PicturePtr pPict,
- 					   int op,
- 					   int unit)
- {
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-     unsigned int i;
--    int max_tex_w, max_tex_h;
--
--    max_tex_w = 16384;
--    max_tex_h = 16384;
--
--    if ((w > max_tex_w) || (h > max_tex_h))
--	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
- 
-     for (i = 0; i < sizeof(EVERGREENTexFormats) / sizeof(EVERGREENTexFormats[0]); i++) {
- 	if (EVERGREENTexFormats[i].fmt == pPict->format)
-@@ -798,9 +789,16 @@ static void EVERGREENXFormSetup(PicturePtr pPict, PixmapPtr pPix,
-     ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-     struct radeon_accel_state *accel_state = info->accel_state;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     int const_offset = unit * 8;
-+    int w, h;
-+
-+    if (pPict->pDrawable) {
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+    } else {
-+	w = 1;
-+	h = 1;
-+    }
- 
-     if (pPict->transform != 0) {
- 	accel_state->is_transform[unit] = TRUE;
-@@ -837,9 +835,7 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
-     ScrnInfoPtr pScrn = xf86Screens[pPix->drawable.pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-     struct radeon_accel_state *accel_state = info->accel_state;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    unsigned int repeatType;
-     unsigned int i;
-     tex_resource_t  tex_res;
-     tex_sampler_t   tex_samp;
-@@ -854,9 +850,17 @@ static Bool EVERGREENTextureSetup(PicturePtr pPict, PixmapPtr pPix,
-     }
- 
-     /* Texture */
-+    if (pPict->pDrawable) {
-+	tex_res.w               = pPict->pDrawable->width;
-+	tex_res.h               = pPict->pDrawable->height;
-+	repeatType              = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    } else {
-+	tex_res.w               = 1;
-+	tex_res.h               = 1;
-+	repeatType              = RepeatNormal;
-+    }
-+
-     tex_res.id                  = unit;
--    tex_res.w                   = w;
--    tex_res.h                   = h;
-     tex_res.pitch               = accel_state->src_obj[unit].pitch;
-     tex_res.depth               = 0;
-     tex_res.dim                 = SQ_TEX_DIM_2D;
-@@ -1054,33 +1058,30 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture,
- {
-     uint32_t tmp1;
-     PixmapPtr pSrcPixmap, pDstPixmap;
--    int max_tex_w, max_tex_h, max_dst_w, max_dst_h;
- 
-     /* Check for unsupported compositing operations. */
-     if (op >= (int) (sizeof(EVERGREENBlendOp) / sizeof(EVERGREENBlendOp[0])))
- 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
- 
--    if (!pSrcPicture->pDrawable)
--	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
-+    if (pSrcPicture->pDrawable) {
-+	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
- 
--    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
--
--    max_tex_w = 8192;
--    max_tex_h = 8192;
--    max_dst_w = 8192;
--    max_dst_h = 8192;
-+	if (pSrcPixmap->drawable.width >= 16384 ||
-+	    pSrcPixmap->drawable.height >= 16384) {
-+	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
-+			     pSrcPixmap->drawable.width,
-+			     pSrcPixmap->drawable.height));
-+	}
- 
--    if (pSrcPixmap->drawable.width >= max_tex_w ||
--	pSrcPixmap->drawable.height >= max_tex_h) {
--	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
--			 pSrcPixmap->drawable.width,
--			 pSrcPixmap->drawable.height));
--    }
-+	if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
-+	    return FALSE;
-+    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
- 
-     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
- 
--    if (pDstPixmap->drawable.width >= max_dst_w ||
--	pDstPixmap->drawable.height >= max_dst_h) {
-+    if (pDstPixmap->drawable.width >= 16384 ||
-+	pDstPixmap->drawable.height >= 16384) {
- 	RADEON_FALLBACK(("Dest w/h too large (%d,%d).\n",
- 			 pDstPixmap->drawable.width,
- 			 pDstPixmap->drawable.height));
-@@ -1089,38 +1090,35 @@ static Bool EVERGREENCheckComposite(int op, PicturePtr pSrcPicture,
-     if (pMaskPicture) {
- 	PixmapPtr pMaskPixmap;
- 
--	if (!pMaskPicture->pDrawable)
--	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
-+	if (pMaskPicture->pDrawable) {
-+	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
- 
--	if (pMaskPixmap->drawable.width >= max_tex_w ||
--	    pMaskPixmap->drawable.height >= max_tex_h) {
--	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
--			     pMaskPixmap->drawable.width,
--			     pMaskPixmap->drawable.height));
--	}
-+	    if (pMaskPixmap->drawable.width >= 16384 ||
-+		pMaskPixmap->drawable.height >= 16384) {
-+	      RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
-+			       pMaskPixmap->drawable.width,
-+			       pMaskPixmap->drawable.height));
-+	    }
- 
--	if (pMaskPicture->componentAlpha) {
--	    /* Check if it's component alpha that relies on a source alpha and
--	     * on the source value.  We can only get one of those into the
--	     * single source value that we get to blend with.
--	     */
--	    if (EVERGREENBlendOp[op].src_alpha &&
--		(EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
--		(BLEND_ZERO << COLOR_SRCBLEND_shift)) {
--		RADEON_FALLBACK(("Component alpha not supported with source "
--				 "alpha and source value blending.\n"));
-+	    if (pMaskPicture->componentAlpha) {
-+		/* Check if it's component alpha that relies on a source alpha and
-+		 * on the source value.  We can only get one of those into the
-+		 * single source value that we get to blend with.
-+		 */
-+		if (EVERGREENBlendOp[op].src_alpha &&
-+		    (EVERGREENBlendOp[op].blend_cntl & COLOR_SRCBLEND_mask) !=
-+		    (BLEND_ZERO << COLOR_SRCBLEND_shift)) {
-+		    RADEON_FALLBACK(("Component alpha not supported with source "
-+				     "alpha and source value blending.\n"));
-+		}
- 	    }
--	}
- 
--	if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
--	    return FALSE;
-+	    if (!EVERGREENCheckCompositeTexture(pMaskPicture, pDstPicture, op, 1))
-+		return FALSE;
-+	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
-     }
- 
--    if (!EVERGREENCheckCompositeTexture(pSrcPicture, pDstPicture, op, 0))
--	return FALSE;
--
-     if (!EVERGREENGetDestFormat(pDstPicture, &tmp1))
- 	return FALSE;
- 
-@@ -1132,7 +1130,8 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
- 				      PicturePtr pMaskPicture, PicturePtr pDstPicture,
- 				      PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-     RADEONInfoPtr info = RADEONPTR(pScrn);
-     struct radeon_accel_state *accel_state = info->accel_state;
-     uint32_t dst_format;
-@@ -1142,13 +1141,19 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
-     struct r600_accel_object src_obj, mask_obj, dst_obj;
-     float *cbuf;
- 
--    if (pDst->drawable.bitsPerPixel < 8 || pSrc->drawable.bitsPerPixel < 8)
-+    if (pDst->drawable.bitsPerPixel < 8 || (pSrc && pSrc->drawable.bitsPerPixel < 8))
- 	return FALSE;
- 
-+    if (!pSrc) {
-+	pSrc = RADEONSolidPixmap(pScreen, pSrcPicture->pSourcePict->solidFill.color);
-+	if (!pSrc)
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+    }
-+
-     src_obj.offset = 0;
-     dst_obj.offset = 0;
--    src_obj.bo = radeon_get_pixmap_bo(pSrc);
-     dst_obj.bo = radeon_get_pixmap_bo(pDst);
-+    src_obj.bo = radeon_get_pixmap_bo(pSrc);
-     dst_obj.surface = radeon_get_pixmap_surface(pDst);
-     src_obj.surface = radeon_get_pixmap_surface(pSrc);
-     dst_obj.tiling_flags = radeon_get_pixmap_tiling(pDst);
-@@ -1166,7 +1171,15 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
-     dst_obj.bpp = pDst->drawable.bitsPerPixel;
-     dst_obj.domain = RADEON_GEM_DOMAIN_VRAM;
- 
--    if (pMask) {
-+    if (pMaskPicture) {
-+	if (!pMask) {
-+	    pMask = RADEONSolidPixmap(pScreen, pMaskPicture->pSourcePict->solidFill.color);
-+	    if (!pMask) {
-+		if (!pSrcPicture->pDrawable)
-+		    pScreen->DestroyPixmap(pSrc);
-+		RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+	    }
-+	}
- 	mask_obj.offset = 0;
- 	mask_obj.bo = radeon_get_pixmap_bo(pMask);
- 	mask_obj.tiling_flags = radeon_get_pixmap_tiling(pMask);
-@@ -1363,11 +1376,9 @@ static Bool EVERGREENPrepareComposite(int op, PicturePtr pSrcPicture,
-     return TRUE;
- }
- 
--static void EVERGREENDoneComposite(PixmapPtr pDst)
-+static void EVERGREENFinishComposite(ScrnInfoPtr pScrn, PixmapPtr pDst,
-+				     struct radeon_accel_state *accel_state)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
--    RADEONInfoPtr info = RADEONPTR(pScrn);
--    struct radeon_accel_state *accel_state = info->accel_state;
-     int vtx_size;
- 
-     if (accel_state->vsync)
-@@ -1381,6 +1392,22 @@ static void EVERGREENDoneComposite(PixmapPtr pDst)
-     evergreen_finish_op(pScrn, vtx_size);
- }
- 
-+static void EVERGREENDoneComposite(PixmapPtr pDst)
-+{
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    RADEONInfoPtr info = RADEONPTR(pScrn);
-+    struct radeon_accel_state *accel_state = info->accel_state;
-+
-+    EVERGREENFinishComposite(pScrn, pDst, accel_state);
-+
-+    if (!accel_state->src_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->src_pix);
-+
-+    if (accel_state->msk_pic && !accel_state->msk_pic->pDrawable)
-+	pScreen->DestroyPixmap(accel_state->msk_pix);
-+}
-+
- static void EVERGREENComposite(PixmapPtr pDst,
- 			       int srcX, int srcY,
- 			       int maskX, int maskY,
-@@ -1393,7 +1420,7 @@ static void EVERGREENComposite(PixmapPtr pDst,
-     float *vb;
- 
-     if (CS_FULL(info->cs)) {
--	EVERGREENDoneComposite(info->accel_state->dst_pix);
-+	EVERGREENFinishComposite(pScrn, pDst, info->accel_state);
- 	radeon_cs_flush_indirect(pScrn);
- 	EVERGREENPrepareComposite(info->accel_state->composite_op,
- 				  info->accel_state->src_pic,
--- 
-1.7.7.5
-
diff --git a/staging/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch b/staging/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch
deleted file mode 100644
index 3a2779446..000000000
--- a/staging/xf86-video-ati/0002-poor-man-s-solid-picture-support-for-r100.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From f36b911ecc31f689ddceeeb11d10eb7cb4a3428d Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Fri, 13 Apr 2012 13:24:46 -0400
-Subject: [PATCH 2/3] poor man's solid picture support for r100
-
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- src/radeon_exa_render.c |  101 +++++++++++++++++++++++++++--------------------
- 1 files changed, 58 insertions(+), 43 deletions(-)
-
-diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
-index b6cc9e4..451a625 100644
---- a/src/radeon_exa_render.c
-+++ b/src/radeon_exa_render.c
-@@ -338,17 +338,8 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict,
- 				      int unit)
- {
-     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     int i;
- 
--    /* r100 limit should be 2048, there are issues with 2048
--     * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
--     */
--
--    if ((w > 2047) || (h > 2047))
--	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
--
-     for (i = 0; i < sizeof(R100TexFormats) / sizeof(R100TexFormats[0]); i++) {
- 	if (R100TexFormats[i].fmt == pPict->format)
- 	    break;
-@@ -357,7 +348,7 @@ static Bool R100CheckCompositeTexture(PicturePtr pPict,
- 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
- 			(int)pPict->format));
- 
--    if (!RADEONCheckTexturePOT(pPict, unit == 0))
-+    if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0))
- 	return FALSE;
- 
-     if (pPict->filter != PictFilterNearest &&
-@@ -392,15 +383,24 @@ static Bool FUNC_NAME(R100TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
- {
-     RINFO_FROM_SCREEN(pPix->drawable.pScreen);
-     uint32_t txfilter, txformat, txoffset, txpitch;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
--    Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
--	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
--    int i;
-+    unsigned int repeatType;
-+    Bool repeat;
-+    int i, w, h;
-     struct radeon_exa_pixmap_priv *driver_priv;
-     ACCEL_PREAMBLE();
- 
-+    if (pPict->pDrawable) {
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+	repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    } else {
-+	w = h = 1;
-+	repeatType = RepeatNormal;
-+    }
-+
-+    repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
-+	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
-+
-     txpitch = exaGetPixmapPitch(pPix);
-     txoffset = 0;
- 
-@@ -510,22 +510,6 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture,
-     if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
- 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
- 
--    if (!pSrcPicture->pDrawable)
--	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--    /* r100 limit should be 2048, there are issues with 2048
--     * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
--     */
--
--    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
--
--    if (pSrcPixmap->drawable.width > 2047 ||
--	pSrcPixmap->drawable.height > 2047) {
--	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
--			 pSrcPixmap->drawable.width,
--			 pSrcPixmap->drawable.height));
--    }
--
-     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
- 
-     if (pDstPixmap->drawable.width > 2047 ||
-@@ -535,20 +519,35 @@ static Bool R100CheckComposite(int op, PicturePtr pSrcPicture,
- 			 pDstPixmap->drawable.height));
-     }
- 
-+    if (pSrcPicture->pDrawable) {
-+	/* r100 limit should be 2048, there are issues with 2048
-+	 * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
-+	 */
-+	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
-+
-+	if (pSrcPixmap->drawable.width > 2047 ||
-+	    pSrcPixmap->drawable.height > 2047) {
-+	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
-+			     pSrcPixmap->drawable.width,
-+			     pSrcPixmap->drawable.height));
-+	}
-+    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
-+
-     if (pMaskPicture) {
- 	PixmapPtr pMaskPixmap;
- 
--	if (!pMaskPicture->pDrawable)
--	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
-+	if (pMaskPicture->pDrawable) {
-+	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
- 
--	if (pMaskPixmap->drawable.width > 2047 ||
--	    pMaskPixmap->drawable.height > 2047) {
--	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
--			     pMaskPixmap->drawable.width,
--			     pMaskPixmap->drawable.height));
--	}
-+	    if (pMaskPixmap->drawable.width > 2047 ||
-+		pMaskPixmap->drawable.height > 2047) {
-+		RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
-+				 pMaskPixmap->drawable.width,
-+				 pMaskPixmap->drawable.height));
-+	    }
-+	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
- 
- 	if (pMaskPicture->componentAlpha) {
- 	    /* Check if it's component alpha that relies on a source alpha and
-@@ -624,7 +623,8 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op,
- 					    PixmapPtr pMask,
- 					    PixmapPtr pDst)
- {
--    RINFO_FROM_SCREEN(pDst->drawable.pScreen);
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    RINFO_FROM_SCREEN(pScreen);
-     uint32_t dst_format, dst_pitch, colorpitch;
-     uint32_t pp_cntl, blendcntl, cblend, ablend;
-     int pixel_shift;
-@@ -648,12 +648,27 @@ static Bool FUNC_NAME(R100PrepareComposite)(int op,
- 
-     CHECK_OFFSET(pDst, 0x0f, "destination");
- 
-+    if (!pSrc) {
-+	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
-+	if (!pSrc)
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+    }
-+
-     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
- 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
- 
-     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE))
- 	return FALSE;
- 
-+    if (pMaskPicture && !pMask) {
-+	pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
-+	if (!pMask) {
-+	    if (!pSrcPicture->pDrawable)
-+		pScreen->DestroyPixmap(pSrc);
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+	}
-+    }
-+
-     RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture,
- 			     pSrc, pMask, pDst);
- 
--- 
-1.7.7.5
-
diff --git a/staging/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch b/staging/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch
deleted file mode 100644
index 0a448fc93..000000000
--- a/staging/xf86-video-ati/0003-poor-man-s-solid-picture-support-for-r200.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From c5c8310858f8018a1754f2457d7b102dc7d62b23 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexander.deucher@amd.com>
-Date: Fri, 13 Apr 2012 13:28:10 -0400
-Subject: [PATCH 3/3] poor man's solid picture support for r200
-
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- src/radeon_exa_render.c |  101 +++++++++++++++++++++++++++--------------------
- 1 files changed, 58 insertions(+), 43 deletions(-)
-
-diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
-index 451a625..7f1a3ff 100644
---- a/src/radeon_exa_render.c
-+++ b/src/radeon_exa_render.c
-@@ -756,17 +756,8 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict,
- 				      int unit)
- {
-     unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
-     int i;
- 
--    /* r200 limit should be 2048, there are issues with 2048
--     * see bug 19269
--     */
--
--    if ((w > 2047) || (h > 2047))
--	RADEON_FALLBACK(("Picture w/h too large (%dx%d)\n", w, h));
--
-     for (i = 0; i < sizeof(R200TexFormats) / sizeof(R200TexFormats[0]); i++)
-     {
- 	if (R200TexFormats[i].fmt == pPict->format)
-@@ -776,7 +767,7 @@ static Bool R200CheckCompositeTexture(PicturePtr pPict,
- 	RADEON_FALLBACK(("Unsupported picture format 0x%x\n",
- 			 (int)pPict->format));
- 
--    if (!RADEONCheckTexturePOT(pPict, unit == 0))
-+    if (pPict->pDrawable && !RADEONCheckTexturePOT(pPict, unit == 0))
- 	return FALSE;
- 
-     if (pPict->filter != PictFilterNearest &&
-@@ -809,15 +800,24 @@ static Bool FUNC_NAME(R200TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
- {
-     RINFO_FROM_SCREEN(pPix->drawable.pScreen);
-     uint32_t txfilter, txformat, txoffset, txpitch;
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    unsigned int repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
--    Bool repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
--	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
--    int i;
-+    unsigned int repeatType;
-+    Bool repeat;
-+    int i, w, h;
-     struct radeon_exa_pixmap_priv *driver_priv;
-     ACCEL_PREAMBLE();
- 
-+    if (pPict->pDrawable) {
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+	repeatType = pPict->repeat ? pPict->repeatType : RepeatNone;
-+    } else {
-+	w = h = 1;
-+	repeatType = RepeatNormal;
-+    }
-+
-+    repeat = (repeatType == RepeatNormal || repeatType == RepeatReflect) &&
-+	!(unit == 0 && (info->accel_state->need_src_tile_x || info->accel_state->need_src_tile_y));
-+
-     txpitch = exaGetPixmapPitch(pPix);
- 
-     txoffset = 0;
-@@ -926,22 +926,6 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
-     if (op >= sizeof(RadeonBlendOp) / sizeof(RadeonBlendOp[0]))
- 	RADEON_FALLBACK(("Unsupported Composite op 0x%x\n", op));
- 
--    if (!pSrcPicture->pDrawable)
--	RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--    /* r200 limit should be 2048, there are issues with 2048
--     * see bug 19269
--     */
--
--    pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
--
--    if (pSrcPixmap->drawable.width > 2047 ||
--	pSrcPixmap->drawable.height > 2047) {
--	RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
--			 pSrcPixmap->drawable.width,
--			 pSrcPixmap->drawable.height));
--    }
--
-     pDstPixmap = RADEONGetDrawablePixmap(pDstPicture->pDrawable);
- 
-     if (pDstPixmap->drawable.width > 2047 ||
-@@ -951,20 +935,35 @@ static Bool R200CheckComposite(int op, PicturePtr pSrcPicture, PicturePtr pMaskP
- 			 pDstPixmap->drawable.height));
-     }
- 
-+    if (pSrcPicture->pDrawable) {
-+	/* r200 limit should be 2048, there are issues with 2048
-+	 * see 197a62704742a4a19736c2637ac92d1dc5ab34ed
-+	 */
-+	pSrcPixmap = RADEONGetDrawablePixmap(pSrcPicture->pDrawable);
-+
-+	if (pSrcPixmap->drawable.width > 2047 ||
-+	    pSrcPixmap->drawable.height > 2047) {
-+	    RADEON_FALLBACK(("Source w/h too large (%d,%d).\n",
-+			     pSrcPixmap->drawable.width,
-+			     pSrcPixmap->drawable.height));
-+	}
-+    } else if (pSrcPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
-+
-     if (pMaskPicture) {
- 	PixmapPtr pMaskPixmap;
- 
--	if (!pMaskPicture->pDrawable)
--	    RADEON_FALLBACK(("Solid or gradient pictures not supported yet\n"));
--
--	pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
-+	if (pMaskPicture->pDrawable) {
-+	    pMaskPixmap = RADEONGetDrawablePixmap(pMaskPicture->pDrawable);
- 
--	if (pMaskPixmap->drawable.width > 2047 ||
--	    pMaskPixmap->drawable.height > 2047) {
--	    RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
--			     pMaskPixmap->drawable.width,
--			     pMaskPixmap->drawable.height));
--	}
-+	    if (pMaskPixmap->drawable.width > 2047 ||
-+		pMaskPixmap->drawable.height > 2047) {
-+		RADEON_FALLBACK(("Mask w/h too large (%d,%d).\n",
-+				 pMaskPixmap->drawable.width,
-+				 pMaskPixmap->drawable.height));
-+	    }
-+	} else if (pMaskPicture->pSourcePict->type != SourcePictTypeSolidFill)
-+	    RADEON_FALLBACK(("Gradient pictures not supported yet\n"));
- 
- 	if (pMaskPicture->componentAlpha) {
- 	    /* Check if it's component alpha that relies on a source alpha and
-@@ -997,7 +996,8 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
- 				PicturePtr pMaskPicture, PicturePtr pDstPicture,
- 				PixmapPtr pSrc, PixmapPtr pMask, PixmapPtr pDst)
- {
--    RINFO_FROM_SCREEN(pDst->drawable.pScreen);
-+    ScreenPtr pScreen = pDst->drawable.pScreen;
-+    RINFO_FROM_SCREEN(pScreen);
-     uint32_t dst_format, dst_pitch;
-     uint32_t pp_cntl, blendcntl, cblend, ablend, colorpitch;
-     int pixel_shift;
-@@ -1024,9 +1024,24 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
-     if (((dst_pitch >> pixel_shift) & 0x7) != 0)
- 	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
- 
-+    if (!pSrc) {
-+	pSrc = RADEONSolidPixmap(pScreen, cpu_to_le32(pSrcPicture->pSourcePict->solidFill.color));
-+	if (!pSrc)
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+    }
-+
-     if (!RADEONSetupSourceTile(pSrcPicture, pSrc, FALSE, TRUE))
- 	return FALSE;
- 
-+    if (pMaskPicture && !pMask) {
-+	pMask = RADEONSolidPixmap(pScreen, cpu_to_le32(pMaskPicture->pSourcePict->solidFill.color));
-+	if (!pMask) {
-+	    if (!pSrcPicture->pDrawable)
-+		pScreen->DestroyPixmap(pSrc);
-+	    RADEON_FALLBACK("Failed to create solid scratch pixmap\n");
-+	}
-+    }
-+
-     RADEONPrepareCompositeCS(op, pSrcPicture, pMaskPicture, pDstPicture,
- 			     pSrc, pMask, pDst);
- 
--- 
-1.7.7.5
-
diff --git a/staging/xf86-video-ati/PKGBUILD b/staging/xf86-video-ati/PKGBUILD
deleted file mode 100644
index 4b8173027..000000000
--- a/staging/xf86-video-ati/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 159723 2012-05-26 09:58:25Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-ati
-pkgver=6.14.99
-_gitdate=20120517
-pkgrel=1.${_gitdate} # 	UMS/EXA: Add reminder for potential solid picture performance issue.
-pkgdesc="X.org ati video driver"
-arch=('i686' 'x86_64')
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('libpciaccess' 'libdrm>=2.4.33' 'udev>=183' 'pixman' 'ati-dri')
-makedepends=('xorg-server-devel>=1.11.99.902' 'xf86driproto' 'mesa' 'glproto')
-conflicts=('xorg-server<1.11.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-		${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2::http://cgit.freedesktop.org/xorg/driver/xf86-video-ati/snapshot/xf86-video-ati-3fb694b308ebadd1b849836059b6b56bb19385f7.tar.gz
-        git_fixes.diff
-        0000-poor-man-s-solid-picture-support-for-r300-r600.patch
-        0001-poor-man-s-solid-picture-support-for-evergreen.patch
-        0002-poor-man-s-solid-picture-support-for-r100.patch
-        0003-poor-man-s-solid-picture-support-for-r200.patch)
-sha1sums=('75ad000bc00599e1797134f2d20d3094cba6af92'
-          '8b774e2f0310075cff2b7d874b0bed38d6245769'
-          '787f88c428f56ca6e96ba5eaf043a30bddfd0e23'
-          '69359a6623fe0f2214790c8ad40cac1a680a3825'
-          'c0709ab82728e34838a8aeead7d1b79b7faf09bd'
-          '77a519e250c27a9fb94eeb52da655eed7c5f2eca')
-sha1sums=('80c12b88e193354af204b13689b2fae922922c6c'
-          '8b774e2f0310075cff2b7d874b0bed38d6245769'
-          '787f88c428f56ca6e96ba5eaf043a30bddfd0e23'
-          '69359a6623fe0f2214790c8ad40cac1a680a3825'
-          'c0709ab82728e34838a8aeead7d1b79b7faf09bd'
-          '77a519e250c27a9fb94eeb52da655eed7c5f2eca')
-
-build() {
-  #cd ${srcdir}/${pkgname}-${pkgver}
-  cd ${srcdir}/${pkgname}*
-  #patch -Np1 -i ${srcdir}/git_fixes.diff
-  
-  # fix rendering issues with recent cairo - testing attemp taken from https://bugs.freedesktop.org/show_bug.cgi?id=47266
-  # and http://lists.x.org/archives/xorg-driver-ati/2012-April/022724.html
-#  patch -Np1 -i ${srcdir}/0000-poor-man-s-solid-picture-support-for-r300-r600.patch
-#  patch -Np1 -i ${srcdir}/0001-poor-man-s-solid-picture-support-for-evergreen.patch
-#  patch -Np1 -i ${srcdir}/0002-poor-man-s-solid-picture-support-for-r100.patch
-#  patch -Np1 -i ${srcdir}/0003-poor-man-s-solid-picture-support-for-r200.patch
-
-  ./autogen.sh --prefix=/usr --enable-dri
-#  ./configure --prefix=/usr --enable-dri
-  make
-}
-
-package() {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
-  make "DESTDIR=${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-ati/git_fixes.diff b/staging/xf86-video-ati/git_fixes.diff
deleted file mode 100644
index 0c4518319..000000000
--- a/staging/xf86-video-ati/git_fixes.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From d282719a9c2fb0ee32830aa75b8dfbb9392954ed Mon Sep 17 00:00:00 2001
-From: Jerome Glisse <jglisse@redhat.com>
-Date: Wed, 04 Apr 2012 21:08:30 +0000
-Subject: r6xx-r9xx: force 1D tiling for buffer with height < 64
-
-Due to some old kernel issue, height is 8 aligned insided the ddx
-For buffer with height btw 57 & 63 this lead ddx to believe it can
-allocate a 2D tiled surface while mesa will not align height and
-will assume 1D tiled leading to disagreement and rendering issue.
-This patch force buffer with height < 64 to be 1D tiled.
-
-Signed-off-by: Jerome Glisse <jglisse@redhat.com>
----
-diff --git a/src/radeon_exa.c b/src/radeon_exa.c
-index 99a5806..270dad4 100644
---- a/src/radeon_exa.c
-+++ b/src/radeon_exa.c
-@@ -511,6 +511,13 @@ void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height,
- 			surface.last_level = 0;
- 			surface.bpe = cpp;
- 			surface.nsamples = 1;
-+			if (height < 64) {
-+				/* disable 2d tiling for small surface to work around
-+				 * the fact that ddx align height to 8 pixel for old
-+				 * obscure reason i can't remember
-+				 */
-+				tiling &= ~RADEON_TILING_MACRO;
-+			}
- 			surface.flags = RADEON_SURF_SCANOUT;
- 			surface.flags |= RADEON_SURF_SET(RADEON_SURF_TYPE_2D, TYPE);
- 			surface.flags |= RADEON_SURF_SET(RADEON_SURF_MODE_LINEAR, MODE);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/xf86-video-intel/PKGBUILD b/staging/xf86-video-intel/PKGBUILD
deleted file mode 100644
index d57f65c68..000000000
--- a/staging/xf86-video-intel/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 159725 2012-05-26 10:02:38Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.19.0
-pkgrel=2
-pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.8' 'libxfixes' 'udev>=183')
-makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender')
-conflicts=('xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('131934cf5e90bd48c883804cc644c4cb8b1de100')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-nouveau/PKGBUILD b/staging/xf86-video-nouveau/PKGBUILD
deleted file mode 100644
index 6e5c8d562..000000000
--- a/staging/xf86-video-nouveau/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 159753 2012-05-26 15:02:22Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: buddabrod <buddabrod@gmail.com>
-
-pkgname=xf86-video-nouveau
-_gitdate=20120512
-pkgver=0.0.16_git${_gitdate} # see configure.ac
-pkgrel=2
-pkgdesc="Open Source 2D acceleration driver for nVidia cards (experimental)"
-arch=('i686' 'x86_64')
-url="http://nouveau.freedesktop.org/wiki/"
-license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e
-depends=('libdrm-nouveau' 'udev')
-optdepends=('nouveau-dri:       experimental gallium3d features')
-makedepends=('xorg-server-devel' 'libdrm-new' 'xf86driproto')
-conflicts=('xorg-server<1.11.99.902')
-options=('!libtool')
-install=$pkgname.install
-source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
-md5sums=('3e27e283219936d64c194eca24cd81cd')
-
-# source PKGBUILD && mksource
-mksource() {
-	mkdir /tmp/$pkgname-${_gitdate}
-	pushd /tmp/$pkgname-${_gitdate}
-	git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau
-	cd xf86-video-nouveau
-	git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/$pkgname-${_gitdate}/$pkgname-${_gitdate}.tar.bz2
-	popd
-}
-
-build() {
-  cd $srcdir/xf86-video-nouveau-${_gitdate}
-  ./autogen.sh --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/xf86-video-nouveau-${_gitdate}
-  make DESTDIR=$pkgdir install
-}
diff --git a/staging/xf86-video-nouveau/xf86-video-nouveau.install b/staging/xf86-video-nouveau/xf86-video-nouveau.install
deleted file mode 100644
index 027154ff3..000000000
--- a/staging/xf86-video-nouveau/xf86-video-nouveau.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install () {
-   cat << _EOF
-  ==> make sure you use KernelModeSetting (KMS)
-  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
-_EOF
-}
-
-post_upgrade() {
-  if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then
-    cat << _EOF
-  ==> ATTENTION: Usermode support has been dropped
-  ==> make sure you use KernelModeSetting (KMS)
-  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
-_EOF
- fi
-}
diff --git a/staging/xfconf/PKGBUILD b/staging/xfconf/PKGBUILD
deleted file mode 100644
index 757bcc41d..000000000
--- a/staging/xfconf/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 159773 2012-05-26 18:14:15Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfconf
-pkgver=4.10.0
-pkgrel=2
-pkgdesc="A simple client-server configuration storage and query system"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-# http://www.xfce.org/documentation/requirements
-# keep dbus, see also http://bugs.archlinux.org/task/14536
-depends=('libxfce4util' 'dbus-glib' 'dbus')
-makedepends=('pkgconfig' 'perl-extutils-depends' 'perl-extutils-pkgconfig'
-             'glib-perl' 'intltool' 'gtk-doc' 'chrpath')
-options=('!libtool' '!emptydirs')
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var \
-    --disable-static \
-    --enable-gtk-doc \
-    --with-perl-options=INSTALLDIRS="vendor" \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # remove unneeded dynloader bootstrap file
-  rm "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.bs"
-
-  # fix insecure rpath, http://bugs.archlinux.org/task/19980
-  chrpath -d "$pkgdir/usr/lib/perl5/vendor_perl/auto/Xfce4/Xfconf/Xfconf.so"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/xorg-server/10-quirks.conf b/staging/xorg-server/10-quirks.conf
deleted file mode 100644
index 7afad22dc..000000000
--- a/staging/xorg-server/10-quirks.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Collection of quirks and blacklist/whitelists for specific devices.
-
-
-# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
-# http://bugs.freedesktop.org/show_bug.cgi?id=22442 
-Section "InputClass"
-        Identifier "ThinkPad HDAPS accelerometer blacklist"
-        MatchProduct "ThinkPad HDAPS accelerometer data"
-        Option "Ignore" "on"
-EndSection
diff --git a/staging/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff b/staging/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
deleted file mode 100644
index 12c110151..000000000
--- a/staging/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
+++ /dev/null
@@ -1,116 +0,0 @@
---- xorg-server-1.12.1/exa/exa_glyphs.c	2012-03-30 04:57:25.000000000 +0200
-+++ xorg-server-1.12.1/exa_glyphs.c.new	2012-04-15 11:48:51.683214230 +0200
-@@ -686,6 +686,7 @@
-     PixmapPtr pMaskPixmap = 0;
-     PicturePtr pMask = NULL;
-     ScreenPtr pScreen = pDst->pDrawable->pScreen;
-+    ExaScreenPriv(pScreen);
-     int width = 0, height = 0;
-     int x, y;
-     int first_xOff = list->xOff, first_yOff = list->yOff;
-@@ -697,7 +698,6 @@
-     ExaGlyphBuffer buffer;
- 
-     if (maskFormat) {
--        ExaScreenPriv(pScreen);
-         GCPtr pGC;
-         xRectangle rect;
- 
-@@ -719,22 +719,20 @@
-                                                 maskFormat->depth,
-                                                 CREATE_PIXMAP_USAGE_SCRATCH);
-         if (!pMaskPixmap)
--            return;
-+	    goto fallback;
-         component_alpha = NeedsComponent(maskFormat->format);
-         pMask = CreatePicture(0, &pMaskPixmap->drawable,
-                               maskFormat, CPComponentAlpha, &component_alpha,
-                               serverClient, &error);
--        if (!pMask ||
--            (!component_alpha && pExaScr->info->CheckComposite &&
--             !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask)))
-+        (*pScreen->DestroyPixmap) (pMaskPixmap);
-+	if (!pMask)
-+	    goto fallback;
-+
-+	if (!component_alpha && pExaScr->info->CheckComposite &&
-+	    !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask))
-         {
-             PictFormatPtr argbFormat;
- 
--            (*pScreen->DestroyPixmap) (pMaskPixmap);
--
--            if (!pMask)
--                return;
--
-             /* The driver can't seem to composite to a8, let's try argb (but
-              * without component-alpha) */
-             FreePicture((pointer) pMask, (XID) 0);
-@@ -748,15 +746,25 @@
-                                                     maskFormat->depth,
-                                                     CREATE_PIXMAP_USAGE_SCRATCH);
-             if (!pMaskPixmap)
--                return;
-+	    goto fallback;
- 
-             pMask = CreatePicture(0, &pMaskPixmap->drawable, maskFormat, 0, 0,
-                                   serverClient, &error);
--            if (!pMask) {
--                (*pScreen->DestroyPixmap) (pMaskPixmap);
--                return;
--            }
-+            (*pScreen->DestroyPixmap) (pMaskPixmap);
-+	    if (!pMask)
-+	    goto fallback;
-         }
-+	  
-+	if (pExaScr->info->CheckComposite &&
-+	    (!(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask) ||
-+	     (!(*pExaScr->info->CheckComposite) (op, pSrc, pMask, pDst) &&
-+	      (op != PictOpOver ||
-+	       !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, pMask, pDst) ||
-+	       !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, pMask, pDst))))) {
-+	    FreePicture ((pointer) pMask, (XID) 0);
-+	    goto fallback;
-+	}
-+
-         pGC = GetScratchGC(pMaskPixmap->drawable.depth, pScreen);
-         ValidateGC(&pMaskPixmap->drawable, pGC);
-         rect.x = 0;
-@@ -769,6 +777,13 @@
-         y = -extents.y1;
-     }
-     else {
-+    	if (pExaScr->info->CheckComposite &&
-+	    !(*pExaScr->info->CheckComposite) (op, pSrc, NULL, pDst) &&
-+	    (op != PictOpOver ||
-+	     !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, NULL, pDst) ||
-+	     !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, NULL, pDst)))
-+	    goto fallback;
-+
-         x = 0;
-         y = 0;
-     }
-@@ -834,6 +849,10 @@
-                          xSrc + x - first_xOff,
-                          ySrc + y - first_yOff, 0, 0, x, y, width, height);
-         FreePicture((pointer) pMask, (XID) 0);
--        (*pScreen->DestroyPixmap) (pMaskPixmap);
-     }
-+    
-+    return;
-+
-+fallback:
-+    ExaCheckGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
- }
---- xorg-server-1.12.1/exa/exa_render.c	2012-03-30 04:57:25.000000000 +0200
-+++ xorg-server-1.12.1/exa_render.c.new	2012-04-15 11:50:35.272482047 +0200
-@@ -878,7 +878,7 @@
-     Bool saveMaskRepeat = pMask ? pMask->repeat : 0;
-     RegionRec region;
- 
--    if (pExaScr->swappedOut)
-+    if (pExaScr->fallback_counter || pExaScr->swappedOut)
-         goto fallback;
- 
-     /* Remove repeat in source if useless */
diff --git a/staging/xorg-server/PKGBUILD b/staging/xorg-server/PKGBUILD
deleted file mode 100644
index 78b533fe1..000000000
--- a/staging/xorg-server/PKGBUILD
+++ /dev/null
@@ -1,200 +0,0 @@
-# $Id: PKGBUILD 159720 2012-05-26 09:47:01Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=xorg-server
-pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.12.1.902
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto'
-             'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess'
-             'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros'
-             'xorg-font-util' 'glproto' 'dri2proto' 'udev>=183' 'libgcrypt')
-options=('!libtool')
-source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
-        autoconfig-nvidia.patch
-        autoconfig-sis.patch
-        #EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
-        #git-fixes.patch
-        xvfb-run
-        xvfb-run.1
-        10-quirks.conf)
-sha256sums=('052efb01c47348b4138c89ad5654be022a4d952acc6129b2ad2659bc1ff4d509'
-            '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
-            'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
-            'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # Use nouveau/nv/nvidia drivers for nvidia devices
-  patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
-
-  # Use unofficial imedia SiS driver for supported SiS devices
-  patch -Np0 -i "${srcdir}/autoconfig-sis.patch"
-
-  # fix glitches and crashes with EXA and cairo 1.12
-  # taken from https://bugs.freedesktop.org/show_bug.cgi?id=47266
-  # and reworked for 1.12.1 changes
-#  patch -Np1 -i ${srcdir}/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
-
-  # Add post-release patches from 1.12 branch
-#  patch -Np1 -i ${srcdir}/git-fixes.patch
-
-  autoreconf -fi
-  ./configure --prefix=/usr \
-      --enable-ipv6 \
-      --enable-dri \
-      --enable-dmx \
-      --enable-xvfb \
-      --enable-xnest \
-      --enable-composite \
-      --enable-xcsecurity \
-      --enable-xorg \
-      --enable-xephyr \
-      --enable-glx-tls \
-      --enable-kdrive \
-      --enable-kdrive-evdev \
-      --enable-kdrive-kbd \
-      --enable-kdrive-mouse \
-      --enable-install-setuid \
-      --enable-config-udev \
-      --disable-config-dbus \
-      --enable-record \
-      --disable-xfbdev \
-      --disable-xfake \
-      --disable-static \
-      --sysconfdir=/etc/X11 \
-      --localstatedir=/var \
-      --with-xkb-path=/usr/share/X11/xkb \
-      --with-xkb-output=/var/lib/xkb \
-      --with-fontrootdir=/usr/share/fonts
-  make
-
-  # Disable subdirs for make install rule to make splitting easier
-  sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
-      -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
-      -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
-      -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \
-      -i hw/Makefile
-}
-
-package_xorg-server-common() {
-  pkgdesc="Xorg server common files"
-  depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
-  
-  make -C xkb DESTDIR="${pkgdir}" install-data
-
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/lib/xorg"
-  install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
-}
-
-package_xorg-server() {
-  pkgdesc="Xorg X server"
-  depends=(libxdmcp libxfont udev libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev)
-  backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf')
-  provides=('x-server')
-  groups=('xorg')
-  conflicts=('nvidia-utils<=290.10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/X11"
-  mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/"
-  install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-
-  rmdir "${pkgdir}/usr/share/X11"
-
-  # Needed for non-mesa drivers, libgl will restore it
-  mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
-     "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
-
-  rm -rf "${pkgdir}/var"
-
-  rm -f "${pkgdir}/usr/share/man/man1/Xserver.1"
-  rm -f "${pkgdir}/usr/lib/xorg/protocol.txt"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING"
-
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/share/aclocal"
-}
-
-package_xorg-server-xephyr() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING"
-}
-
-package_xorg-server-xvfb() {
-  pkgdesc="Virtual framebuffer X server"
-  depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-  install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING"
-}
-
-package_xorg-server-xnest() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libxext libgcrypt pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING"
-}
-
-package_xorg-server-xdmx() {
-  pkgdesc="Distributed Multihead X Server and utilities"
-  depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING"
-}
-
-package_xorg-server-devel() {
-  pkgdesc="Development files for the X.Org X server"
-  depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/bin"
-  rm -rf "${pkgdir}/usr/share/man"
-  rm -rf "${pkgdir}/usr/share/doc"
-  rm -rf "${pkgdir}/usr/share/X11"
-  rm -rf "${pkgdir}/usr/lib/xorg"
-  rm -rf "${pkgdir}/var"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
-}
diff --git a/staging/xorg-server/autoconfig-nvidia.patch b/staging/xorg-server/autoconfig-nvidia.patch
deleted file mode 100644
index 6d5220ac7..000000000
--- a/staging/xorg-server/autoconfig-nvidia.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c
---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c	2012-02-10 10:10:37.583014924 +0000
-+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c	2012-02-10 11:16:07.148971317 +0000
-@@ -1144,7 +1144,23 @@
-         int idx = 0;
- 
- #ifdef __linux__
--        driverList[idx++] = "nouveau";
-+	    switch (dev->device_id)
-+		{
-+		/* NV1 */
-+		case 0x0008:
-+		case 0x0009:
-+		    driverList[idx++] = "vesa";
-+		    break;
-+		/* NV3 */
-+		case 0x0018:
-+		case 0x0019:
-+		    driverList[idx++] = "nouveau";
-+		    break;
-+		default:
-+		    driverList[idx++] = "nouveau";
-+		    driverList[idx++] = "nvidia";
-+		    break;
-+		}
- #endif
-         driverList[idx++] = "nv";
-         break;
diff --git a/staging/xorg-server/autoconfig-sis.patch b/staging/xorg-server/autoconfig-sis.patch
deleted file mode 100644
index 0b50049db..000000000
--- a/staging/xorg-server/autoconfig-sis.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- hw/xfree86/common/xf86pciBus.c.orig	2011-09-24 10:53:45.421697668 +0000
-+++ hw/xfree86/common/xf86pciBus.c	2011-09-24 10:55:56.416250708 +0000
-@@ -1200,9 +1200,15 @@
-             break;
-         }
-         break;
--    case 0x1039:
--        driverList[0] = "sis";
--        break;
-+	case 0x1039:
-+	    switch (dev->device_id)
-+	    {
-+		case 0x6350: case 0x6351:
-+		    driverList[0] = "sisimedia"; driverList[1] = "sis"; break;
-+		default:
-+		    driverList[0] = "sis"; break;
-+	    }
-+	    break;
-     case 0x126f:
-         driverList[0] = "siliconmotion";
-         break;
diff --git a/staging/xorg-server/git-fixes.patch b/staging/xorg-server/git-fixes.patch
deleted file mode 100644
index f6ca2426b..000000000
--- a/staging/xorg-server/git-fixes.patch
+++ /dev/null
@@ -1,1717 +0,0 @@
-From b5bf0ac5405eab77f26bb2f8726644232af17178 Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp@keithp.com>
-Date: Wed, 11 Apr 2012 16:28:21 +0000
-Subject: hw/xfree86: Spurious ');' in xf86vmode.c messed up indentation badly
-
-Inside the unfinished XF86VIDMODE_EVENTS #ifdef block the
-function definition for xf86VidModeNotifyEvent had an extra ');'
-before the prototype argument declarations. This was harmless for the
-compiler as the code never gets used, but completely messed up the
-file re-indentation. This patch removes the spurious characters in
-preparation for re-indenting the file.
-
-Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit 592bd0ae2b60cd6f6afd3efc40f5f659b12900b4)
----
-diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
-index 6e2a8e9..9f64f8e 100644
---- a/hw/xfree86/dixmods/extmod/xf86vmode.c
-+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
-@@ -75,7 +75,7 @@ static unsigned char XF86VidModeReqCode = 0;
- #ifdef XF86VIDMODE_EVENTS
- static int XF86VidModeEventBase = 0;
- 
--static void SXF86VidModeNotifyEvent();
-+static void SXF86VidModeNotifyEvent(
- xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent *        /* to */
-     );
- 
---
-cgit v0.9.0.2-2-gbebe
-From 3ad72a80088fe3236f38bd0696b04f399e24fe3d Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp@keithp.com>
-Date: Wed, 11 Apr 2012 16:33:54 +0000
-Subject: hw/xfree86: Re-indent xf86vmode.c
-
-This is the result of re-running the 'x-indent.sh' script over
-xf86vmode.c to clean up the disaster caused by broken syntax in the
-file.
-
-Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit 9779b904c7c0b49c74054c22c420012c40595cdc)
----
-diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
-index 9f64f8e..68c4b58 100644
---- a/hw/xfree86/dixmods/extmod/xf86vmode.c
-+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
-@@ -75,8 +75,7 @@ static unsigned char XF86VidModeReqCode = 0;
- #ifdef XF86VIDMODE_EVENTS
- static int XF86VidModeEventBase = 0;
- 
--static void SXF86VidModeNotifyEvent(
--xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent *        /* to */
-+static void SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent *    /* to */
-     );
- 
- static RESTYPE EventType;       /* resource type for event masks */
-@@ -117,20 +116,22 @@ static DevPrivateKeyRec ScreenPrivateKeyRec;
- #define DEBUG_P(x) /**/
- #endif
-     static int
-- ClientMajorVersion(ClientPtr client) {
-+ClientMajorVersion(ClientPtr client)
-+{
-     VidModePrivPtr pPriv;
- 
--     pPriv = VM_GETPRIV(client);
-+    pPriv = VM_GETPRIV(client);
-     if (!pPriv)
--         return 0;
-+        return 0;
-     else
--         return pPriv->major;
-+        return pPriv->major;
- }
-+
- #ifdef XF86VIDMODE_EVENTS
- static void
-- CheckScreenPrivate(pScreen)
-+CheckScreenPrivate(pScreen)
- ScreenPtr
--    pScreen;
-+ pScreen;
- {
-     SetupScreen(pScreen);
- 
-@@ -142,9 +143,10 @@ ScreenPtr
-     }
- }
- 
--static XF86VidModeScreenPrivatePtr MakeScreenPrivate(pScreen)
-+static XF86VidModeScreenPrivatePtr
-+MakeScreenPrivate(pScreen)
- ScreenPtr
--    pScreen;
-+ pScreen;
- {
-     SetupScreen(pScreen);
- 
-@@ -160,18 +162,22 @@ ScreenPtr
- }
- 
- static unsigned long
-- getEventMask(ScreenPtr pScreen, ClientPtr client) {
-+getEventMask(ScreenPtr pScreen, ClientPtr client)
-+{
-     SetupScreen(pScreen);
-     XF86VidModeEventPtr pEv;
- 
-     if (!pPriv)
--         return 0;
-+        return 0;
-     for (pEv = pPriv->events; pEv; pEv = pEv->next)
-         if (pEv->client == client)
-             return pEv->mask;
--     return 0;
--} static Bool
-- setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask) {
-+    return 0;
-+}
-+
-+static Bool
-+setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask)
-+{
-     SetupScreen(pScreen);
-     XF86VidModeEventPtr pEv, *pPrev;
- 
-@@ -181,7 +187,8 @@ static unsigned long
-         pPriv = MakeScreenPrivate(pScreen);
-         if (!pPriv)
-             return FALSE;
--    } for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
-+    }
-+    for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
-         if (pEv->client == client)
-             break;
-     if (mask == 0) {
-@@ -208,38 +215,43 @@ static unsigned long
- }
- 
- static int
-- XF86VidModeFreeEvents(pointer value, XID id) {
-+XF86VidModeFreeEvents(pointer value, XID id)
-+{
-     XF86VidModeEventPtr pOld = (XF86VidModeEventPtr) value;
-     ScreenPtr pScreen = pOld->screen;
--     SetupScreen(pScreen);
-+
-+    SetupScreen(pScreen);
-     XF86VidModeEventPtr pEv, *pPrev;
- 
-     if (!pPriv)
--         return TRUE;
-+        return TRUE;
-     for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
-         if (pEv == pOld)
-             break;
-     if (!pEv)
--         return TRUE;
-+        return TRUE;
-     *pPrev = pEv->next;
--     free(pEv);
--     CheckScreenPrivate(pScreen);
--     return TRUE;
--} static void
-- SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced) {
-+    free(pEv);
-+    CheckScreenPrivate(pScreen);
-+    return TRUE;
-+}
-+
-+static void
-+SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced)
-+{
-     XF86VidModeScreenPrivatePtr pPriv;
-     XF86VidModeEventPtr pEv;
-     unsigned long mask;
-     xXF86VidModeNotifyEvent ev;
-     int kind;
- 
--     UpdateCurrentTimeIf();
--     mask = XF86VidModeNotifyMask;
--     pScreen = screenInfo.screens[pScreen->myNum];
--     pPriv = GetScreenPrivate(pScreen);
-+    UpdateCurrentTimeIf();
-+    mask = XF86VidModeNotifyMask;
-+    pScreen = screenInfo.screens[pScreen->myNum];
-+    pPriv = GetScreenPrivate(pScreen);
-     if (!pPriv)
--         return;
--     kind = XF86VidModeModeChange;
-+        return;
-+    kind = XF86VidModeModeChange;
-     for (pEv = pPriv->events; pEv; pEv = pEv->next) {
-         if (!(pEv->mask & mask))
-             continue;
-@@ -251,8 +263,10 @@ static int
-         ev.forced = forced;
-         WriteEventsToClient(pEv->client, 1, (xEvent *) &ev);
- }} static void
-- SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * from,
--                         xXF86VidModeNotifyEvent * to) {
-+
-+SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * from,
-+                        xXF86VidModeNotifyEvent * to)
-+{
-     to->type = from->type;
-     to->state = from->state;
-     cpswaps(from->sequenceNumber, to->sequenceNumber);
-@@ -264,29 +278,31 @@ static int
- #endif
- 
- static int
-- ProcXF86VidModeQueryVersion(ClientPtr client) {
-+ProcXF86VidModeQueryVersion(ClientPtr client)
-+{
-     xXF86VidModeQueryVersionReply rep;
- 
--     DEBUG_P("XF86VidModeQueryVersion");
-+    DEBUG_P("XF86VidModeQueryVersion");
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq);
--     rep.type = X_Reply;
--     rep.length = 0;
--     rep.sequenceNumber = client->sequence;
--     rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION;
--     rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION;
-+    REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq);
-+    rep.type = X_Reply;
-+    rep.length = 0;
-+    rep.sequenceNumber = client->sequence;
-+    rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION;
-+    rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION;
-     if (client->swapped) {
-         swaps(&rep.sequenceNumber);
-         swapl(&rep.length);
-         swaps(&rep.majorVersion);
-         swaps(&rep.minorVersion);
--    } WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply),
--                    (char *) &rep);
-+    }
-+    WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply), (char *) &rep);
-     return Success;
- }
- 
- static int
-- ProcXF86VidModeGetModeLine(ClientPtr client) {
-+ProcXF86VidModeGetModeLine(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetModeLineReq);
-     xXF86VidModeGetModeLineReply rep;
-     xXF86OldVidModeGetModeLineReply oldrep;
-@@ -294,11 +310,11 @@ static int
-     int dotClock;
-     int ver;
- 
--     DEBUG_P("XF86VidModeGetModeline");
-+    DEBUG_P("XF86VidModeGetModeline");
- 
--     ver = ClientMajorVersion(client);
--     REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
--     rep.type = X_Reply;
-+    ver = ClientMajorVersion(client);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
-+    rep.type = X_Reply;
-     if (ver < 2) {
-         rep.length = bytes_to_int32(SIZEOF(xXF86OldVidModeGetModeLineReply) -
-                                     SIZEOF(xGenericReply));
-@@ -386,7 +402,8 @@ static int
- }
- 
- static int
-- ProcXF86VidModeGetAllModeLines(ClientPtr client) {
-+ProcXF86VidModeGetAllModeLines(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetAllModeLinesReq);
-     xXF86VidModeGetAllModeLinesReply rep;
-     xXF86VidModeModeInfo mdinf;
-@@ -395,38 +412,39 @@ static int
-     int modecount, dotClock;
-     int ver;
- 
--     DEBUG_P("XF86VidModeGetAllModelines");
-+    DEBUG_P("XF86VidModeGetAllModelines");
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
--     ver = ClientMajorVersion(client);
-+    ver = ClientMajorVersion(client);
- 
--     modecount = VidModeGetNumOfModes(stuff->screen);
-+    modecount = VidModeGetNumOfModes(stuff->screen);
-     if (modecount < 1)
--         return VidModeErrorBase + XF86VidModeExtensionDisabled;
-+        return VidModeErrorBase + XF86VidModeExtensionDisabled;
- 
-     if (!VidModeGetFirstModeline(stuff->screen, &mode, &dotClock))
--         return BadValue;
-+        return BadValue;
- 
--     rep.type = X_Reply;
--     rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) -
-+    rep.type = X_Reply;
-+    rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) -
-         SIZEOF(xGenericReply);
-     if (ver < 2)
--         rep.length += modecount * sizeof(xXF86OldVidModeModeInfo);
-+        rep.length += modecount * sizeof(xXF86OldVidModeModeInfo);
-     else
--         rep.length += modecount * sizeof(xXF86VidModeModeInfo);
--     rep.length >>= 2;
--     rep.sequenceNumber = client->sequence;
--     rep.modecount = modecount;
-+        rep.length += modecount * sizeof(xXF86VidModeModeInfo);
-+    rep.length >>= 2;
-+    rep.sequenceNumber = client->sequence;
-+    rep.modecount = modecount;
-     if (client->swapped) {
-         swaps(&rep.sequenceNumber);
-         swapl(&rep.length);
-         swapl(&rep.modecount);
--    } WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply),
--                    (char *) &rep);
-+    }
-+    WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply),
-+                  (char *) &rep);
- 
-     do {
-         mdinf.dotclock = dotClock;
-@@ -492,7 +510,8 @@ static int
-      && VidModeGetModeValue(mode, VIDMODE_FLAGS)  == stuff->flags )
- 
- static int
-- ProcXF86VidModeAddModeLine(ClientPtr client) {
-+ProcXF86VidModeAddModeLine(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeAddModeLineReq);
-     xXF86OldVidModeAddModeLineReq *oldstuff =
-         (xXF86OldVidModeAddModeLineReq *) client->requestBuffer;
-@@ -502,9 +521,9 @@ static int
-     int dotClock;
-     int ver;
- 
--     DEBUG_P("XF86VidModeAddModeline");
-+    DEBUG_P("XF86VidModeAddModeline");
- 
--     ver = ClientMajorVersion(client);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         /* convert from old format */
-         stuff = &newstuff;
-@@ -533,7 +552,8 @@ static int
-         stuff->after_vsyncend = oldstuff->after_vsyncend;
-         stuff->after_vtotal = oldstuff->after_vtotal;
-         stuff->after_flags = oldstuff->after_flags;
--    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-+    }
-+    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-         ErrorF("AddModeLine - scrn: %d clock: %ld\n",
-                (int) stuff->screen, (unsigned long) stuff->dotclock);
-         ErrorF("AddModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n",
-@@ -654,7 +674,8 @@ static int
- }
- 
- static int
-- ProcXF86VidModeDeleteModeLine(ClientPtr client) {
-+ProcXF86VidModeDeleteModeLine(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeDeleteModeLineReq);
-     xXF86OldVidModeDeleteModeLineReq *oldstuff =
-         (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer;
-@@ -663,9 +684,9 @@ static int
-     int len, dotClock;
-     int ver;
- 
--     DEBUG_P("XF86VidModeDeleteModeline");
-+    DEBUG_P("XF86VidModeDeleteModeline");
- 
--     ver = ClientMajorVersion(client);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         /* convert from old format */
-         stuff = &newstuff;
-@@ -683,7 +704,8 @@ static int
-         stuff->vtotal = oldstuff->vtotal;
-         stuff->flags = oldstuff->flags;
-         stuff->privsize = oldstuff->privsize;
--    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-+    }
-+    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-         ErrorF("DeleteModeLine - scrn: %d clock: %ld\n",
-                (int) stuff->screen, (unsigned long) stuff->dotclock);
-         ErrorF("                 hdsp: %d hbeg: %d hend: %d httl: %d\n",
-@@ -777,7 +799,8 @@ static int
- }
- 
- static int
-- ProcXF86VidModeModModeLine(ClientPtr client) {
-+ProcXF86VidModeModModeLine(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeModModeLineReq);
-     xXF86OldVidModeModModeLineReq *oldstuff =
-         (xXF86OldVidModeModModeLineReq *) client->requestBuffer;
-@@ -786,9 +809,9 @@ static int
-     int len, dotClock;
-     int ver;
- 
--     DEBUG_P("XF86VidModeModModeline");
-+    DEBUG_P("XF86VidModeModModeline");
- 
--     ver = ClientMajorVersion(client);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         /* convert from old format */
-         stuff = &newstuff;
-@@ -805,7 +828,8 @@ static int
-         stuff->vtotal = oldstuff->vtotal;
-         stuff->flags = oldstuff->flags;
-         stuff->privsize = oldstuff->privsize;
--    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-+    }
-+    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-         ErrorF("ModModeLine - scrn: %d hdsp: %d hbeg: %d hend: %d httl: %d\n",
-                (int) stuff->screen, stuff->hdisplay, stuff->hsyncstart,
-                stuff->hsyncend, stuff->htotal);
-@@ -903,7 +927,8 @@ static int
- }
- 
- static int
-- ProcXF86VidModeValidateModeLine(ClientPtr client) {
-+ProcXF86VidModeValidateModeLine(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeValidateModeLineReq);
-     xXF86OldVidModeValidateModeLineReq *oldstuff =
-         (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer;
-@@ -913,9 +938,9 @@ static int
-     int len, status, dotClock;
-     int ver;
- 
--     DEBUG_P("XF86VidModeValidateModeline");
-+    DEBUG_P("XF86VidModeValidateModeline");
- 
--     ver = ClientMajorVersion(client);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         /* convert from old format */
-         stuff = &newstuff;
-@@ -933,7 +958,8 @@ static int
-         stuff->vtotal = oldstuff->vtotal;
-         stuff->flags = oldstuff->flags;
-         stuff->privsize = oldstuff->privsize;
--    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-+    }
-+    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-         ErrorF("ValidateModeLine - scrn: %d clock: %ld\n",
-                (int) stuff->screen, (unsigned long) stuff->dotclock);
-         ErrorF("                   hdsp: %d hbeg: %d hend: %d httl: %d\n",
-@@ -1022,7 +1048,8 @@ static int
- }
- 
- static int
-- ProcXF86VidModeSwitchMode(ClientPtr client) {
-+ProcXF86VidModeSwitchMode(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSwitchModeReq);
- 
-     DEBUG_P("XF86VidModeSwitchMode");
-@@ -1035,8 +1062,11 @@ static int
-     VidModeZoomViewport(stuff->screen, (short) stuff->zoom);
- 
-     return Success;
--} static int
-- ProcXF86VidModeSwitchToMode(ClientPtr client) {
-+}
-+
-+static int
-+ProcXF86VidModeSwitchToMode(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSwitchToModeReq);
-     xXF86OldVidModeSwitchToModeReq *oldstuff =
-         (xXF86OldVidModeSwitchToModeReq *) client->requestBuffer;
-@@ -1045,9 +1075,9 @@ static int
-     int len, dotClock;
-     int ver;
- 
--     DEBUG_P("XF86VidModeSwitchToMode");
-+    DEBUG_P("XF86VidModeSwitchToMode");
- 
--     ver = ClientMajorVersion(client);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         /* convert from old format */
-         stuff = &newstuff;
-@@ -1065,7 +1095,8 @@ static int
-         stuff->vtotal = oldstuff->vtotal;
-         stuff->flags = oldstuff->flags;
-         stuff->privsize = oldstuff->privsize;
--    } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-+    }
-+    if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
-         ErrorF("SwitchToMode - scrn: %d clock: %ld\n",
-                (int) stuff->screen, (unsigned long) stuff->dotclock);
-         ErrorF("               hdsp: %d hbeg: %d hend: %d httl: %d\n",
-@@ -1138,7 +1169,8 @@ static int
- }
- 
- static int
-- ProcXF86VidModeLockModeSwitch(ClientPtr client) {
-+ProcXF86VidModeLockModeSwitch(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeLockModeSwitchReq);
- 
-     REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq);
-@@ -1152,53 +1184,57 @@ static int
-         return VidModeErrorBase + XF86VidModeZoomLocked;
- 
-     return Success;
--} static int
-- ProcXF86VidModeGetMonitor(ClientPtr client) {
-+}
-+
-+static int
-+ProcXF86VidModeGetMonitor(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetMonitorReq);
-     xXF86VidModeGetMonitorReply rep;
-     CARD32 *hsyncdata, *vsyncdata;
-     int i, nHsync, nVrefresh;
-     pointer monitor;
- 
--     DEBUG_P("XF86VidModeGetMonitor");
-+    DEBUG_P("XF86VidModeGetMonitor");
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
-     if (!VidModeGetMonitor(stuff->screen, &monitor))
--         return BadValue;
-+        return BadValue;
- 
--     nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i;
--     nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i;
-+    nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i;
-+    nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i;
- 
--     rep.type = X_Reply;
-+    rep.type = X_Reply;
-     if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VENDOR, 0)).ptr)
--         rep.vendorLength = strlen((char *) (VidModeGetMonitorValue(monitor,
--                                                                    VIDMODE_MON_VENDOR,
--                                                                    0)).ptr);
-+        rep.vendorLength = strlen((char *) (VidModeGetMonitorValue(monitor,
-+                                                                   VIDMODE_MON_VENDOR,
-+                                                                   0)).ptr);
-     else
--         rep.vendorLength = 0;
-+        rep.vendorLength = 0;
-     if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_MODEL, 0)).ptr)
--         rep.modelLength = strlen((char *) (VidModeGetMonitorValue(monitor,
--                                                                   VIDMODE_MON_MODEL,
--                                                                   0)).ptr);
-+        rep.modelLength = strlen((char *) (VidModeGetMonitorValue(monitor,
-+                                                                  VIDMODE_MON_MODEL,
-+                                                                  0)).ptr);
-     else
--         rep.modelLength = 0;
--     rep.length =
-+        rep.modelLength = 0;
-+    rep.length =
-         bytes_to_int32(SIZEOF(xXF86VidModeGetMonitorReply) -
-                        SIZEOF(xGenericReply) + (nHsync +
-                                                 nVrefresh) * sizeof(CARD32) +
-                        pad_to_int32(rep.vendorLength) +
-                        pad_to_int32(rep.modelLength));
--     rep.sequenceNumber = client->sequence;
--     rep.nhsync = nHsync;
--     rep.nvsync = nVrefresh;
--     hsyncdata = malloc(nHsync * sizeof(CARD32));
-+    rep.sequenceNumber = client->sequence;
-+    rep.nhsync = nHsync;
-+    rep.nvsync = nVrefresh;
-+    hsyncdata = malloc(nHsync * sizeof(CARD32));
-     if (!hsyncdata) {
-         return BadAlloc;
--    } vsyncdata = malloc(nVrefresh * sizeof(CARD32));
-+    }
-+    vsyncdata = malloc(nVrefresh * sizeof(CARD32));
- 
-     if (!vsyncdata) {
-         free(hsyncdata);
-@@ -1208,19 +1244,18 @@ static int
-     for (i = 0; i < nHsync; i++) {
-         hsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor,
-                                                                 VIDMODE_MON_HSYNC_LO,
--                                                                i)).
--            f | (unsigned
--                 short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_HSYNC_HI,
--                                                i)).f << 16;
-+                                                                i)).f |
-+            (unsigned
-+             short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_HSYNC_HI,
-+                                            i)).f << 16;
-     }
-     for (i = 0; i < nVrefresh; i++) {
-         vsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor,
-                                                                 VIDMODE_MON_VREFRESH_LO,
--                                                                i)).
--            f | (unsigned
--                 short) (VidModeGetMonitorValue(monitor,
--                                                VIDMODE_MON_VREFRESH_HI,
--                                                i)).f << 16;
-+                                                                i)).f |
-+            (unsigned
-+             short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VREFRESH_HI,
-+                                            i)).f << 16;
-     }
- 
-     if (client->swapped) {
-@@ -1249,38 +1284,40 @@ static int
- }
- 
- static int
-- ProcXF86VidModeGetViewPort(ClientPtr client) {
-+ProcXF86VidModeGetViewPort(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetViewPortReq);
-     xXF86VidModeGetViewPortReply rep;
-     int x, y;
- 
--     DEBUG_P("XF86VidModeGetViewPort");
-+    DEBUG_P("XF86VidModeGetViewPort");
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
--     rep.type = X_Reply;
--     rep.length = 0;
--     rep.sequenceNumber = client->sequence;
-+    rep.type = X_Reply;
-+    rep.length = 0;
-+    rep.sequenceNumber = client->sequence;
- 
--     VidModeGetViewPort(stuff->screen, &x, &y);
--     rep.x = x;
--     rep.y = y;
-+    VidModeGetViewPort(stuff->screen, &x, &y);
-+    rep.x = x;
-+    rep.y = y;
- 
-     if (client->swapped) {
-         swaps(&rep.sequenceNumber);
-         swapl(&rep.length);
-         swapl(&rep.x);
-         swapl(&rep.y);
--    } WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply),
--                    (char *) &rep);
-+    }
-+    WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply), (char *) &rep);
-     return Success;
- }
- 
- static int
-- ProcXF86VidModeSetViewPort(ClientPtr client) {
-+ProcXF86VidModeSetViewPort(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSetViewPortReq);
- 
-     DEBUG_P("XF86VidModeSetViewPort");
-@@ -1294,8 +1331,11 @@ static int
-         return BadValue;
- 
-     return Success;
--} static int
-- ProcXF86VidModeGetDotClocks(ClientPtr client) {
-+}
-+
-+static int
-+ProcXF86VidModeGetDotClocks(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetDotClocksReq);
-     xXF86VidModeGetDotClocksReply rep;
-     int n;
-@@ -1304,31 +1344,33 @@ static int
-     int *Clocks = NULL;
-     Bool ClockProg;
- 
--     DEBUG_P("XF86VidModeGetDotClocks");
-+    DEBUG_P("XF86VidModeGetDotClocks");
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
--     numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg);
-+    numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg);
- 
--     rep.type = X_Reply;
--     rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply)
--                                 - SIZEOF(xGenericReply) + numClocks);
--     rep.sequenceNumber = client->sequence;
--     rep.clocks = numClocks;
--     rep.maxclocks = MAXCLOCKS;
--     rep.flags = 0;
-+    rep.type = X_Reply;
-+    rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply)
-+                                - SIZEOF(xGenericReply) + numClocks);
-+    rep.sequenceNumber = client->sequence;
-+    rep.clocks = numClocks;
-+    rep.maxclocks = MAXCLOCKS;
-+    rep.flags = 0;
- 
-     if (!ClockProg) {
-         Clocks = malloc(numClocks * sizeof(int));
-         if (!Clocks)
--             return BadValue;
-+            return BadValue;
-         if (!VidModeGetClocks(stuff->screen, Clocks)) {
-             free(Clocks);
-             return BadValue;
--    }} if (ClockProg) {
-+        }
-+    }
-+    if (ClockProg) {
-         rep.flags |= CLKFLAG_PROGRAMABLE;
-     }
-     if (client->swapped) {
-@@ -1356,7 +1398,8 @@ static int
- }
- 
- static int
-- ProcXF86VidModeSetGamma(ClientPtr client) {
-+ProcXF86VidModeSetGamma(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSetGammaReq);
- 
-     DEBUG_P("XF86VidModeSetGamma");
-@@ -1372,79 +1415,89 @@ static int
-         return BadValue;
- 
-     return Success;
--} static int
-- ProcXF86VidModeGetGamma(ClientPtr client) {
-+}
-+
-+static int
-+ProcXF86VidModeGetGamma(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetGammaReq);
-     xXF86VidModeGetGammaReply rep;
-     float red, green, blue;
- 
--     DEBUG_P("XF86VidModeGetGamma");
-+    DEBUG_P("XF86VidModeGetGamma");
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
--     rep.type = X_Reply;
--     rep.length = 0;
--     rep.sequenceNumber = client->sequence;
-+    rep.type = X_Reply;
-+    rep.length = 0;
-+    rep.sequenceNumber = client->sequence;
-     if (!VidModeGetGamma(stuff->screen, &red, &green, &blue))
--         return BadValue;
--     rep.red = (CARD32) (red * 10000.);
--     rep.green = (CARD32) (green * 10000.);
--     rep.blue = (CARD32) (blue * 10000.);
-+        return BadValue;
-+    rep.red = (CARD32) (red * 10000.);
-+    rep.green = (CARD32) (green * 10000.);
-+    rep.blue = (CARD32) (blue * 10000.);
-     if (client->swapped) {
-         swaps(&rep.sequenceNumber);
-         swapl(&rep.length);
-         swapl(&rep.red);
-         swapl(&rep.green);
-         swapl(&rep.blue);
--    } WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *) &rep);
-+    }
-+    WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *) &rep);
- 
-     return Success;
- }
- 
- static int
-- ProcXF86VidModeSetGammaRamp(ClientPtr client) {
-+ProcXF86VidModeSetGammaRamp(ClientPtr client)
-+{
-     CARD16 *r, *g, *b;
-     int length;
--     REQUEST(xXF86VidModeSetGammaRampReq);
-+
-+    REQUEST(xXF86VidModeSetGammaRampReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
-     if (stuff->size != VidModeGetGammaRampSize(stuff->screen))
--         return BadValue;
-+        return BadValue;
- 
--     length = (stuff->size + 1) & ~1;
-+    length = (stuff->size + 1) & ~1;
- 
--     REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6);
-+    REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6);
- 
--     r = (CARD16 *) &stuff[1];
--     g = r + length;
--     b = g + length;
-+    r = (CARD16 *) &stuff[1];
-+    g = r + length;
-+    b = g + length;
- 
-     if (!VidModeSetGammaRamp(stuff->screen, stuff->size, r, g, b))
--         return BadValue;
-+        return BadValue;
- 
--     return Success;
--} static int
-- ProcXF86VidModeGetGammaRamp(ClientPtr client) {
-+    return Success;
-+}
-+
-+static int
-+ProcXF86VidModeGetGammaRamp(ClientPtr client)
-+{
-     CARD16 *ramp = NULL;
-     int length;
-     size_t ramplen = 0;
-     xXF86VidModeGetGammaRampReply rep;
--     REQUEST(xXF86VidModeGetGammaRampReq);
-+
-+    REQUEST(xXF86VidModeGetGammaRampReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
-     if (stuff->size != VidModeGetGammaRampSize(stuff->screen))
--         return BadValue;
-+        return BadValue;
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
- 
--     length = (stuff->size + 1) & ~1;
-+    length = (stuff->size + 1) & ~1;
- 
-     if (stuff->size) {
-         ramplen = length * 3 * sizeof(CARD16);
-@@ -1455,7 +1508,9 @@ static int
-                                  ramp, ramp + length, ramp + (length * 2))) {
-             free(ramp);
-             return BadValue;
--    }} rep.type = X_Reply;
-+        }
-+    }
-+    rep.type = X_Reply;
-     rep.length = (length >> 1) * 3;
-     rep.sequenceNumber = client->sequence;
-     rep.size = stuff->size;
-@@ -1476,47 +1531,53 @@ static int
- }
- 
- static int
-- ProcXF86VidModeGetGammaRampSize(ClientPtr client) {
-+ProcXF86VidModeGetGammaRampSize(ClientPtr client)
-+{
-     xXF86VidModeGetGammaRampSizeReply rep;
--     REQUEST(xXF86VidModeGetGammaRampSizeReq);
-+
-+    REQUEST(xXF86VidModeGetGammaRampSizeReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
- 
--     rep.type = X_Reply;
--     rep.length = 0;
--     rep.sequenceNumber = client->sequence;
--     rep.size = VidModeGetGammaRampSize(stuff->screen);
-+    rep.type = X_Reply;
-+    rep.length = 0;
-+    rep.sequenceNumber = client->sequence;
-+    rep.size = VidModeGetGammaRampSize(stuff->screen);
-     if (client->swapped) {
-         swaps(&rep.sequenceNumber);
-         swapl(&rep.length);
-         swaps(&rep.size);
--    } WriteToClient(client, sizeof(xXF86VidModeGetGammaRampSizeReply),
--                    (char *) &rep);
-+    }
-+    WriteToClient(client, sizeof(xXF86VidModeGetGammaRampSizeReply),
-+                  (char *) &rep);
- 
-     return Success;
- }
- 
- static int
-- ProcXF86VidModeGetPermissions(ClientPtr client) {
-+ProcXF86VidModeGetPermissions(ClientPtr client)
-+{
-     xXF86VidModeGetPermissionsReply rep;
--     REQUEST(xXF86VidModeGetPermissionsReq);
-+
-+    REQUEST(xXF86VidModeGetPermissionsReq);
- 
-     if (stuff->screen >= screenInfo.numScreens)
--         return BadValue;
-+        return BadValue;
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
- 
--     rep.type = X_Reply;
--     rep.length = 0;
--     rep.sequenceNumber = client->sequence;
--     rep.permissions = XF86VM_READ_PERMISSION;
-+    rep.type = X_Reply;
-+    rep.length = 0;
-+    rep.sequenceNumber = client->sequence;
-+    rep.permissions = XF86VM_READ_PERMISSION;
-     if (xf86GetVidModeEnabled() &&
-         (xf86GetVidModeAllowNonLocal() || LocalClient(client))) {
-         rep.permissions |= XF86VM_WRITE_PERMISSION;
--    } if (client->swapped) {
-+    }
-+    if (client->swapped) {
-         swaps(&rep.sequenceNumber);
-         swapl(&rep.length);
-         swapl(&rep.permissions);
-@@ -1528,21 +1589,23 @@ static int
- }
- 
- static int
-- ProcXF86VidModeSetClientVersion(ClientPtr client) {
-+ProcXF86VidModeSetClientVersion(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSetClientVersionReq);
- 
-     VidModePrivPtr pPriv;
- 
--     DEBUG_P("XF86VidModeSetClientVersion");
-+    DEBUG_P("XF86VidModeSetClientVersion");
- 
--     REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
-+    REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
- 
-     if ((pPriv = VM_GETPRIV(client)) == NULL) {
-         pPriv = malloc(sizeof(VidModePrivRec));
-         if (!pPriv)
-             return BadAlloc;
-         VM_SETPRIV(client, pPriv);
--    } pPriv->major = stuff->major;
-+    }
-+    pPriv->major = stuff->major;
- 
-     pPriv->minor = stuff->minor;
- 
-@@ -1550,85 +1613,103 @@ static int
- }
- 
- static int
-- ProcXF86VidModeDispatch(ClientPtr client) {
-+ProcXF86VidModeDispatch(ClientPtr client)
-+{
-     REQUEST(xReq);
-     switch (stuff->data) {
-     case X_XF86VidModeQueryVersion:
-         return ProcXF86VidModeQueryVersion(client);
--        case X_XF86VidModeGetModeLine:return ProcXF86VidModeGetModeLine(client);
--        case X_XF86VidModeGetMonitor:return ProcXF86VidModeGetMonitor(client);
--        case X_XF86VidModeGetAllModeLines:return
--            ProcXF86VidModeGetAllModeLines(client);
--        case X_XF86VidModeValidateModeLine:return
--            ProcXF86VidModeValidateModeLine(client);
--        case X_XF86VidModeGetViewPort:return ProcXF86VidModeGetViewPort(client);
--        case X_XF86VidModeGetDotClocks:return
--            ProcXF86VidModeGetDotClocks(client);
--        case X_XF86VidModeSetClientVersion:return
--            ProcXF86VidModeSetClientVersion(client);
--        case X_XF86VidModeGetGamma:return ProcXF86VidModeGetGamma(client);
--        case X_XF86VidModeGetGammaRamp:return
--            ProcXF86VidModeGetGammaRamp(client);
--        case X_XF86VidModeGetGammaRampSize:return
--            ProcXF86VidModeGetGammaRampSize(client);
--        case X_XF86VidModeGetPermissions:return
--            ProcXF86VidModeGetPermissions(client);
--        default:if (!xf86GetVidModeEnabled())
-+    case X_XF86VidModeGetModeLine:
-+        return ProcXF86VidModeGetModeLine(client);
-+    case X_XF86VidModeGetMonitor:
-+        return ProcXF86VidModeGetMonitor(client);
-+    case X_XF86VidModeGetAllModeLines:
-+        return ProcXF86VidModeGetAllModeLines(client);
-+    case X_XF86VidModeValidateModeLine:
-+        return ProcXF86VidModeValidateModeLine(client);
-+    case X_XF86VidModeGetViewPort:
-+        return ProcXF86VidModeGetViewPort(client);
-+    case X_XF86VidModeGetDotClocks:
-+        return ProcXF86VidModeGetDotClocks(client);
-+    case X_XF86VidModeSetClientVersion:
-+        return ProcXF86VidModeSetClientVersion(client);
-+    case X_XF86VidModeGetGamma:
-+        return ProcXF86VidModeGetGamma(client);
-+    case X_XF86VidModeGetGammaRamp:
-+        return ProcXF86VidModeGetGammaRamp(client);
-+    case X_XF86VidModeGetGammaRampSize:
-+        return ProcXF86VidModeGetGammaRampSize(client);
-+    case X_XF86VidModeGetPermissions:
-+        return ProcXF86VidModeGetPermissions(client);
-+    default:
-+        if (!xf86GetVidModeEnabled())
-             return VidModeErrorBase + XF86VidModeExtensionDisabled;
-         if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) {
-             switch (stuff->data) {
-             case X_XF86VidModeAddModeLine:
-                 return ProcXF86VidModeAddModeLine(client);
--                case X_XF86VidModeDeleteModeLine:return
--                    ProcXF86VidModeDeleteModeLine(client);
--                case X_XF86VidModeModModeLine:return
--                    ProcXF86VidModeModModeLine(client);
--                case X_XF86VidModeSwitchMode:return
--                    ProcXF86VidModeSwitchMode(client);
--                case X_XF86VidModeSwitchToMode:return
--                    ProcXF86VidModeSwitchToMode(client);
--                case X_XF86VidModeLockModeSwitch:return
--                    ProcXF86VidModeLockModeSwitch(client);
--                case X_XF86VidModeSetViewPort:return
--                    ProcXF86VidModeSetViewPort(client);
--                case X_XF86VidModeSetGamma:return
--                    ProcXF86VidModeSetGamma(client);
--                case X_XF86VidModeSetGammaRamp:return
--                    ProcXF86VidModeSetGammaRamp(client);
--                default:return BadRequest;
--        }}
-+            case X_XF86VidModeDeleteModeLine:
-+                return ProcXF86VidModeDeleteModeLine(client);
-+            case X_XF86VidModeModModeLine:
-+                return ProcXF86VidModeModModeLine(client);
-+            case X_XF86VidModeSwitchMode:
-+                return ProcXF86VidModeSwitchMode(client);
-+            case X_XF86VidModeSwitchToMode:
-+                return ProcXF86VidModeSwitchToMode(client);
-+            case X_XF86VidModeLockModeSwitch:
-+                return ProcXF86VidModeLockModeSwitch(client);
-+            case X_XF86VidModeSetViewPort:
-+                return ProcXF86VidModeSetViewPort(client);
-+            case X_XF86VidModeSetGamma:
-+                return ProcXF86VidModeSetGamma(client);
-+            case X_XF86VidModeSetGammaRamp:
-+                return ProcXF86VidModeSetGammaRamp(client);
-+            default:
-+                return BadRequest;
-+            }
-+        }
-         else
--             return VidModeErrorBase + XF86VidModeClientNotLocal;
-+            return VidModeErrorBase + XF86VidModeClientNotLocal;
-     }
- }
- 
- static int
-- SProcXF86VidModeQueryVersion(ClientPtr client) {
-+SProcXF86VidModeQueryVersion(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeQueryVersionReq);
-     swaps(&stuff->length);
-     return ProcXF86VidModeQueryVersion(client);
--} static int
-- SProcXF86VidModeGetModeLine(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeGetModeLine(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetModeLineReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetModeLine(client);
--} static int
-- SProcXF86VidModeGetAllModeLines(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeGetAllModeLines(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetAllModeLinesReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetAllModeLines(client);
--} static int
-- SProcXF86VidModeAddModeLine(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeAddModeLine(ClientPtr client)
-+{
-     xXF86OldVidModeAddModeLineReq *oldstuff =
-         (xXF86OldVidModeAddModeLineReq *) client->requestBuffer;
-     int ver;
- 
--     REQUEST(xXF86VidModeAddModeLineReq);
--     ver = ClientMajorVersion(client);
-+    REQUEST(xXF86VidModeAddModeLineReq);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         swaps(&oldstuff->length);
-         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeAddModeLineReq);
-@@ -1666,13 +1747,14 @@ static int
- }
- 
- static int
-- SProcXF86VidModeDeleteModeLine(ClientPtr client) {
-+SProcXF86VidModeDeleteModeLine(ClientPtr client)
-+{
-     xXF86OldVidModeDeleteModeLineReq *oldstuff =
-         (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer;
-     int ver;
- 
--     REQUEST(xXF86VidModeDeleteModeLineReq);
--     ver = ClientMajorVersion(client);
-+    REQUEST(xXF86VidModeDeleteModeLineReq);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         swaps(&oldstuff->length);
-         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeDeleteModeLineReq);
-@@ -1710,13 +1792,14 @@ static int
- }
- 
- static int
-- SProcXF86VidModeModModeLine(ClientPtr client) {
-+SProcXF86VidModeModModeLine(ClientPtr client)
-+{
-     xXF86OldVidModeModModeLineReq *oldstuff =
-         (xXF86OldVidModeModModeLineReq *) client->requestBuffer;
-     int ver;
- 
--     REQUEST(xXF86VidModeModModeLineReq);
--     ver = ClientMajorVersion(client);
-+    REQUEST(xXF86VidModeModModeLineReq);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         swaps(&oldstuff->length);
-         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeModModeLineReq);
-@@ -1754,13 +1837,14 @@ static int
- }
- 
- static int
-- SProcXF86VidModeValidateModeLine(ClientPtr client) {
-+SProcXF86VidModeValidateModeLine(ClientPtr client)
-+{
-     xXF86OldVidModeValidateModeLineReq *oldstuff =
-         (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer;
-     int ver;
- 
--     REQUEST(xXF86VidModeValidateModeLineReq);
--     ver = ClientMajorVersion(client);
-+    REQUEST(xXF86VidModeValidateModeLineReq);
-+    ver = ClientMajorVersion(client);
-     if (ver < 2) {
-         swaps(&oldstuff->length);
-         REQUEST_AT_LEAST_SIZE(xXF86OldVidModeValidateModeLineReq);
-@@ -1798,44 +1882,60 @@ static int
- }
- 
- static int
-- SProcXF86VidModeSwitchMode(ClientPtr client) {
-+SProcXF86VidModeSwitchMode(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSwitchModeReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeSwitchModeReq);
-     swaps(&stuff->screen);
-     swaps(&stuff->zoom);
-     return ProcXF86VidModeSwitchMode(client);
--} static int
-- SProcXF86VidModeSwitchToMode(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeSwitchToMode(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSwitchToModeReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeSwitchToModeReq);
-     swapl(&stuff->screen);
-     return ProcXF86VidModeSwitchToMode(client);
--} static int
-- SProcXF86VidModeLockModeSwitch(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeLockModeSwitch(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeLockModeSwitchReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq);
-     swaps(&stuff->screen);
-     swaps(&stuff->lock);
-     return ProcXF86VidModeLockModeSwitch(client);
--} static int
-- SProcXF86VidModeGetMonitor(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeGetMonitor(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetMonitorReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetMonitor(client);
--} static int
-- SProcXF86VidModeGetViewPort(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeGetViewPort(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetViewPortReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetViewPort(client);
--} static int
-- SProcXF86VidModeSetViewPort(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeSetViewPort(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSetViewPortReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeSetViewPortReq);
-@@ -1843,23 +1943,32 @@ static int
-     swapl(&stuff->x);
-     swapl(&stuff->y);
-     return ProcXF86VidModeSetViewPort(client);
--} static int
-- SProcXF86VidModeGetDotClocks(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeGetDotClocks(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetDotClocksReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetDotClocks(client);
--} static int
-- SProcXF86VidModeSetClientVersion(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeSetClientVersion(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSetClientVersionReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
-     swaps(&stuff->major);
-     swaps(&stuff->minor);
-     return ProcXF86VidModeSetClientVersion(client);
--} static int
-- SProcXF86VidModeSetGamma(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeSetGamma(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeSetGammaReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeSetGammaReq);
-@@ -1868,120 +1977,145 @@ static int
-     swapl(&stuff->green);
-     swapl(&stuff->blue);
-     return ProcXF86VidModeSetGamma(client);
--} static int
-- SProcXF86VidModeGetGamma(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeGetGamma(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetGammaReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetGamma(client);
--} static int
-- SProcXF86VidModeSetGammaRamp(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeSetGammaRamp(ClientPtr client)
-+{
-     int length;
--     REQUEST(xXF86VidModeSetGammaRampReq);
--     swaps(&stuff->length);
--     REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq);
--     swaps(&stuff->size);
--     swaps(&stuff->screen);
--     length = ((stuff->size + 1) & ~1) * 6;
--     REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length);
--     SwapRestS(stuff);
--     return ProcXF86VidModeSetGammaRamp(client);
--} static int
-- SProcXF86VidModeGetGammaRamp(ClientPtr client) {
-+
-+    REQUEST(xXF86VidModeSetGammaRampReq);
-+    swaps(&stuff->length);
-+    REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq);
-+    swaps(&stuff->size);
-+    swaps(&stuff->screen);
-+    length = ((stuff->size + 1) & ~1) * 6;
-+    REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length);
-+    SwapRestS(stuff);
-+    return ProcXF86VidModeSetGammaRamp(client);
-+}
-+
-+static int
-+SProcXF86VidModeGetGammaRamp(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetGammaRampReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
-     swaps(&stuff->size);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetGammaRamp(client);
--} static int
-- SProcXF86VidModeGetGammaRampSize(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeGetGammaRampSize(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetGammaRampSizeReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetGammaRampSize(client);
--} static int
-- SProcXF86VidModeGetPermissions(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeGetPermissions(ClientPtr client)
-+{
-     REQUEST(xXF86VidModeGetPermissionsReq);
-     swaps(&stuff->length);
-     REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
-     swaps(&stuff->screen);
-     return ProcXF86VidModeGetPermissions(client);
--} static int
-- SProcXF86VidModeDispatch(ClientPtr client) {
-+}
-+
-+static int
-+SProcXF86VidModeDispatch(ClientPtr client)
-+{
-     REQUEST(xReq);
-     switch (stuff->data) {
-     case X_XF86VidModeQueryVersion:
-         return SProcXF86VidModeQueryVersion(client);
--        case X_XF86VidModeGetModeLine:return
--            SProcXF86VidModeGetModeLine(client);
--        case X_XF86VidModeGetMonitor:return SProcXF86VidModeGetMonitor(client);
--        case X_XF86VidModeGetAllModeLines:return
--            SProcXF86VidModeGetAllModeLines(client);
--        case X_XF86VidModeGetViewPort:return
--            SProcXF86VidModeGetViewPort(client);
--        case X_XF86VidModeValidateModeLine:return
--            SProcXF86VidModeValidateModeLine(client);
--        case X_XF86VidModeGetDotClocks:return
--            SProcXF86VidModeGetDotClocks(client);
--        case X_XF86VidModeSetClientVersion:return
--            SProcXF86VidModeSetClientVersion(client);
--        case X_XF86VidModeGetGamma:return SProcXF86VidModeGetGamma(client);
--        case X_XF86VidModeGetGammaRamp:return
--            SProcXF86VidModeGetGammaRamp(client);
--        case X_XF86VidModeGetGammaRampSize:return
--            SProcXF86VidModeGetGammaRampSize(client);
--        case X_XF86VidModeGetPermissions:return
--            SProcXF86VidModeGetPermissions(client);
--        default:if (!xf86GetVidModeEnabled())
-+    case X_XF86VidModeGetModeLine:
-+        return SProcXF86VidModeGetModeLine(client);
-+    case X_XF86VidModeGetMonitor:
-+        return SProcXF86VidModeGetMonitor(client);
-+    case X_XF86VidModeGetAllModeLines:
-+        return SProcXF86VidModeGetAllModeLines(client);
-+    case X_XF86VidModeGetViewPort:
-+        return SProcXF86VidModeGetViewPort(client);
-+    case X_XF86VidModeValidateModeLine:
-+        return SProcXF86VidModeValidateModeLine(client);
-+    case X_XF86VidModeGetDotClocks:
-+        return SProcXF86VidModeGetDotClocks(client);
-+    case X_XF86VidModeSetClientVersion:
-+        return SProcXF86VidModeSetClientVersion(client);
-+    case X_XF86VidModeGetGamma:
-+        return SProcXF86VidModeGetGamma(client);
-+    case X_XF86VidModeGetGammaRamp:
-+        return SProcXF86VidModeGetGammaRamp(client);
-+    case X_XF86VidModeGetGammaRampSize:
-+        return SProcXF86VidModeGetGammaRampSize(client);
-+    case X_XF86VidModeGetPermissions:
-+        return SProcXF86VidModeGetPermissions(client);
-+    default:
-+        if (!xf86GetVidModeEnabled())
-             return VidModeErrorBase + XF86VidModeExtensionDisabled;
-         if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) {
-             switch (stuff->data) {
-             case X_XF86VidModeAddModeLine:
-                 return SProcXF86VidModeAddModeLine(client);
--                case X_XF86VidModeDeleteModeLine:return
--                    SProcXF86VidModeDeleteModeLine(client);
--                case X_XF86VidModeModModeLine:return
--                    SProcXF86VidModeModModeLine(client);
--                case X_XF86VidModeSwitchMode:return
--                    SProcXF86VidModeSwitchMode(client);
--                case X_XF86VidModeSwitchToMode:return
--                    SProcXF86VidModeSwitchToMode(client);
--                case X_XF86VidModeLockModeSwitch:return
--                    SProcXF86VidModeLockModeSwitch(client);
--                case X_XF86VidModeSetViewPort:return
--                    SProcXF86VidModeSetViewPort(client);
--                case X_XF86VidModeSetGamma:return
--                    SProcXF86VidModeSetGamma(client);
--                case X_XF86VidModeSetGammaRamp:return
--                    SProcXF86VidModeSetGammaRamp(client);
--                default:return BadRequest;
--        }}
-+            case X_XF86VidModeDeleteModeLine:
-+                return SProcXF86VidModeDeleteModeLine(client);
-+            case X_XF86VidModeModModeLine:
-+                return SProcXF86VidModeModModeLine(client);
-+            case X_XF86VidModeSwitchMode:
-+                return SProcXF86VidModeSwitchMode(client);
-+            case X_XF86VidModeSwitchToMode:
-+                return SProcXF86VidModeSwitchToMode(client);
-+            case X_XF86VidModeLockModeSwitch:
-+                return SProcXF86VidModeLockModeSwitch(client);
-+            case X_XF86VidModeSetViewPort:
-+                return SProcXF86VidModeSetViewPort(client);
-+            case X_XF86VidModeSetGamma:
-+                return SProcXF86VidModeSetGamma(client);
-+            case X_XF86VidModeSetGammaRamp:
-+                return SProcXF86VidModeSetGammaRamp(client);
-+            default:
-+                return BadRequest;
-+            }
-+        }
-         else
--             return VidModeErrorBase + XF86VidModeClientNotLocal;
-+            return VidModeErrorBase + XF86VidModeClientNotLocal;
-     }
- }
- 
- void
-- XFree86VidModeExtensionInit(void) {
-+XFree86VidModeExtensionInit(void)
-+{
-     ExtensionEntry *extEntry;
-     ScreenPtr pScreen;
-     int i;
-     Bool enabled = FALSE;
- 
--     DEBUG_P("XFree86VidModeExtensionInit");
-+    DEBUG_P("XFree86VidModeExtensionInit");
- 
-     if (!dixRegisterPrivateKey(&VidModeClientPrivateKeyRec, PRIVATE_CLIENT, 0))
--         return;
-+        return;
- #ifdef XF86VIDMODE_EVENTS
-     if (!dixRegisterPrivateKey(&ScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
--         return;
-+        return;
- #endif
- 
- #ifdef XF86VIDMODE_EVENTS
--     EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent");
-+    EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent");
- #endif
- 
-     for (i = 0; i < screenInfo.numScreens; i++) {
-@@ -1990,8 +2124,8 @@ void
-             enabled = TRUE;
-     }
-     /* This means that the DDX doesn't want the vidmode extension enabled */
--        if (!enabled)
--         return;
-+    if (!enabled)
-+        return;
- 
-     if (
- #ifdef XF86VIDMODE_EVENTS
---
-cgit v0.9.0.2-2-gbebe
-From 15607cf2dc87405606b20113011f1ebd97637d32 Mon Sep 17 00:00:00 2001
-From: Daniel Kurtz <djkurtz@chromium.org>
-Date: Thu, 12 Apr 2012 00:11:10 +0000
-Subject: dix: don't BUG_WARN for button events from button-only device
-
-Events from button-only devices still need coordinates, and they get them
-from scale_to_desktop().  Therefore, a dev without valuators is not a bug.
-However, a dev with valuators, but less than two of them still is a bug.
-
-This was noticed when unplugging a "Creative Technology SB Arena Headset",
-which has some BTNs and some KEYs, but no REL or ABS valuators.
-It emits [BTN_3] = 0 on unplug, which would trigger the BUG_WARN.
-
-Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit c5a45b0f7658c77725adce2b64a0fbd62f208328)
----
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 4e0af45..9dc9617 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -842,7 +842,7 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask,
-     ScreenPtr scr = miPointerGetScreen(dev);
-     double x, y;
- 
--    BUG_WARN(!dev->valuator || dev->valuator->numAxes < 2);
-+    BUG_WARN(dev->valuator && dev->valuator->numAxes < 2);
-     if (!dev->valuator || dev->valuator->numAxes < 2) {
-         /* if we have no axes, last.valuators must be in screen coords
-          * anyway */
---
-cgit v0.9.0.2-2-gbebe
-From f8d2ca759ad37d5e99d462f21a2259ce17bb1a00 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 18 Apr 2012 05:56:37 +0000
-Subject: dix: indentation fix
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit ebf214876a4885a98ded4f5525925b69005fae05)
----
-diff --git a/dix/dispatch.c b/dix/dispatch.c
-index 9a2e22f..d971805 100644
---- a/dix/dispatch.c
-+++ b/dix/dispatch.c
-@@ -416,8 +416,8 @@ Dispatch(void)
-                 if (XSERVER_REQUEST_START_ENABLED())
-                     XSERVER_REQUEST_START(LookupMajorName(client->majorOp),
-                                           client->majorOp,
--                                          ((xReq *) client->requestBuffer)->
--                                          length, client->index,
-+                                          ((xReq *) client->requestBuffer)->length,
-+                                          client->index,
-                                           client->requestBuffer);
- #endif
-                 if (result > (maxBigRequestSize << 2))
---
-cgit v0.9.0.2-2-gbebe
-From f012f0c48dedba4df69cc1a1ecdf8ee5d37daca9 Mon Sep 17 00:00:00 2001
-From: Michal Suchanek <hramrach@gmail.com>
-Date: Thu, 26 Apr 2012 13:11:20 +0000
-Subject: dmx: Annotate dmxlog.c with _X_ATTRIBUTE_PRINTF and _X_NORETURN
-
-and fix resulting printf warning in dmxLogVisual
-
-Signed-off-by: Michal Suchanek <hramrach@gmail.com>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit d662fa2450856777b59c4b62b912395a8bfd52fd)
----
-diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c
-index b56bb93..151f672 100644
---- a/hw/dmx/dmxlog.c
-+++ b/hw/dmx/dmxlog.c
-@@ -86,6 +86,8 @@ ErrorF(const char *format, ...)
- 
- /** Provide an VFatalError function when used stand-alone. */
- static void
-+VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN;
-+static void
- VFatalError(const char *format, va_list args)
- {
-     vfprintf(stderr, format, args);     /* RATS: We assume the format string
-@@ -104,7 +106,9 @@ VErrorF(const char *format, va_list args)
- }
- #else
- /** This function was removed between XFree86 4.3.0 and XFree86 4.4.0. */
--extern void AbortServer(void);
-+extern void AbortServer(void) _X_NORETURN;
-+static void
-+VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN;
- static void
- VFatalError(const char *format, va_list args)
- {
-@@ -166,6 +170,8 @@ dmxHeader(dmxLogLevel logLevel, DMXInputInfo * dmxInput,
- /* Prints the error message with the appropriate low-level X output
-  * routine. */
- static void
-+dmxMessage(dmxLogLevel logLevel, const char *format, va_list args) _X_ATTRIBUTE_PRINTF(2, 0);
-+static void
- dmxMessage(dmxLogLevel logLevel, const char *format, va_list args)
- {
-     if (logLevel == dmxFatal || logLevel >= dmxCurrentLogLevel) {
-@@ -303,10 +309,11 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual)
-         class = "DirectColor";
-         break;
-     }
-+#define VisualLogFormat "0x%02lx %s %2db %db/rgb %3d 0x%04lx 0x%04lx 0x%04lx%s\n"
- 
-     if (dmxScreen) {
-         dmxLogOutput(dmxScreen,
--                     "0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n",
-+                     VisualLogFormat,
-                      vi->visualid, class, vi->depth, vi->bits_per_rgb,
-                      vi->colormap_size,
-                      vi->red_mask, vi->green_mask, vi->blue_mask,
-@@ -314,7 +321,7 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual)
-     }
-     else {
-         dmxLog(dmxInfo,
--               "  0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n",
-+               "  " VisualLogFormat,
-                vi->visualid, class, vi->depth, vi->bits_per_rgb,
-                vi->colormap_size,
-                vi->red_mask, vi->green_mask, vi->blue_mask,
-diff --git a/hw/dmx/dmxlog.h b/hw/dmx/dmxlog.h
-index 4d4cd26..162484b 100644
---- a/hw/dmx/dmxlog.h
-+++ b/hw/dmx/dmxlog.h
-@@ -55,18 +55,23 @@ typedef enum {
- /* Logging functions used by Xserver/hw/dmx routines. */
- extern dmxLogLevel dmxSetLogLevel(dmxLogLevel newLevel);
- extern dmxLogLevel dmxGetLogLevel(void);
--extern void dmxLog(dmxLogLevel logLevel, const char *format, ...);
--extern void dmxLogCont(dmxLogLevel logLevel, const char *format, ...);
-+extern void dmxLog(dmxLogLevel logLevel, const char *format,
-+                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
-+extern void dmxLogCont(dmxLogLevel logLevel, const char *format,
-+                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
- extern const char *dmxEventName(int type);
- 
- #ifndef DMX_LOG_STANDALONE
--extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format, ...);
-+extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format,
-+                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
- extern void dmxLogOutputCont(DMXScreenInfo * dmxScreen, const char *format,
--                             ...);
-+                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
- extern void dmxLogOutputWarning(DMXScreenInfo * dmxScreen, const char *format,
--                                ...);
--extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format, ...);
--extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format, ...);
-+                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
-+extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format,
-+                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
-+extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format,
-+                             ...) _X_ATTRIBUTE_PRINTF(2, 3);
- extern void dmxLogArgs(dmxLogLevel logLevel, int argc, char **argv);
- extern void dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi,
-                          int defaultVisual);
---
-cgit v0.9.0.2-2-gbebe
-From 58dfb13953af71021317b9d85230b1163198f031 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Thu, 10 May 2012 07:53:20 +0000
-Subject: Revert "dix: when disabling a device, release all buttons and keys"
-
-This reverts commit 90299556db24543bb7365e8c2897deca3aa219e7.
-
-The commit being reverted triggered a segfault on server shutdown when a
-device posts raw events after the root windows are forced to NULL.
-
-https://lists.debian.org/debian-x/2012/05/msg00240.html
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/dix/devices.c b/dix/devices.c
-index d0e99bd..0125504 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -432,8 +432,6 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
-     if (*prev != dev)
-         return FALSE;
- 
--    ReleaseButtonsAndKeys(dev);
--
-     /* float attached devices */
-     if (IsMaster(dev)) {
-         for (other = inputInfo.devices; other; other = other->next) {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/xorg-server/xvfb-run b/staging/xorg-server/xvfb-run
deleted file mode 100644
index 4c2f4e0d3..000000000
--- a/staging/xorg-server/xvfb-run
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/sh
-
-# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x8"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Clean up files
-clean_up() {
-    if [ -e "$AUTHFILE" ]; then
-        XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1
-    fi
-    if [ -n "$XVFB_RUN_TMPDIR" ]; then
-        if ! rm -r "$XVFB_RUN_TMPDIR"; then
-            error "problem while cleaning up temporary directory"
-            exit 5
-        fi
-    fi
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ae:f:hn:lp:s:w: \
-       --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! which xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# tidy up after ourselves
-trap clean_up EXIT
-
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)"
-    AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority"
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-XVFBPID=$!
-sleep "$STARTWAIT"
-if ! kill -0 $XVFBPID 2>/dev/null; then
-  echo "Xvfb failed to start" >&2
-  exit 1
-fi
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/staging/xorg-server/xvfb-run.1 b/staging/xorg-server/xvfb-run.1
deleted file mode 100644
index 137d3a196..000000000
--- a/staging/xorg-server/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This 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 General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/staging/xpdf/PKGBUILD b/staging/xpdf/PKGBUILD
deleted file mode 100644
index 7545e3692..000000000
--- a/staging/xpdf/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 158960 2012-05-13 16:58:43Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=xpdf
-#pkgver=3.03_pl1
-pkgver=3.03
-pkgrel=2
-pkgdesc='Viewer for Portable Document Format (PDF) files'
-url='http://www.foolabs.com/xpdf/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('lesstif' 'gsfonts' 'libxt')
-optdepends=('poppler: tools that used to be included in xpdf'
-            'desktop-file-utils: for desktop environments')
-#       "ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}pl1.patch"
-source=("ftp://ftp.foolabs.com/pub/${pkgname}/${pkgname}-${pkgver%_*}.tar.gz"
-        'char.patch'
-        'desktop')
-sha1sums=('499423e8a795e0efd76ca798239eb4d0d52fe248'
-          '5c471944685a6b24a2b0c0e000562d1a3263aeeb'
-          '3b6fe01636253676ffa0efe1b237a75af4721f6d')
-
-install=install
-backup=('etc/xpdfrc')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver%_*}"
-
-#	patch -p1 -i "../${pkgname}-${_srcver}pl1.patch"
-	patch -p1 -i ../char.patch
-
-	sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' xpdf/GlobalParams.cc
-	sed -i 's:times-medium-r-normal--16:times-medium-r-normal--14:' xpdf/XPDFViewer.cc # FS#14217
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--enable-multithreaded \
-		--enable-wordlist \
-		--with-freetype2-library=/usr/lib \
-		--with-freetype2-includes=/usr/include/freetype2 \
-		--x-includes=/usr/include \
-		--with-Xm-library=/usr/lib \
-		--with-Xm-includes=/usr/include \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver%_*}"
-
-	make DESTDIR="${pkgdir}" install
-
-	install -Dm644 ../desktop "${pkgdir}/usr/share/applications/xpdf.desktop"
-	install -Dm644 xpdf/xpdfIcon.xpm "${pkgdir}/usr/share/pixmaps/xpdf.xpm"
-
-	# stuff provided by poppler
-	for tool in pdfdetach pdffonts pdfimages pdfinfo pdftoppm pdftops pdftotext; do
-		rm "${pkgdir}/usr/bin/${tool}" "${pkgdir}/usr/share/man/man1/${tool}.1"
-	done
-}
diff --git a/staging/xpdf/char.patch b/staging/xpdf/char.patch
deleted file mode 100644
index 8e49393a6..000000000
--- a/staging/xpdf/char.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/xpdf/XPDFViewer.cc new/xpdf/XPDFViewer.cc
---- old/xpdf/XPDFViewer.cc	2011-08-15 14:08:53.000000000 -0700
-+++ new/xpdf/XPDFViewer.cc	2011-08-17 11:05:55.739431215 -0700
-@@ -1803,7 +1803,7 @@
-   menuPane = XmCreatePulldownMenu(toolBar, "zoomMenuPane", args, n);
-   for (i = 0; i < nZoomMenuItems; ++i) {
-     n = 0;
--    s = XmStringCreateLocalized(zoomMenuInfo[i].label);
-+    s = XmStringCreateLocalized((char *)zoomMenuInfo[i].label);
-     XtSetArg(args[n], XmNlabelString, s); ++n;
-     XtSetArg(args[n], XmNuserData, (XtPointer)i); ++n;
-     sprintf(buf, "zoom%d", i);
diff --git a/staging/xpdf/desktop b/staging/xpdf/desktop
deleted file mode 100644
index 06830ecda..000000000
--- a/staging/xpdf/desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Xpdf
-Comment=Views Adobe PDF (acrobat) files
-Exec=xpdf
-Terminal=false
-Type=Application
-Icon=xpdf
-Categories=Office;
-MimeType=application/pdf;
diff --git a/staging/xpdf/install b/staging/xpdf/install
deleted file mode 100644
index c6cf149dd..000000000
--- a/staging/xpdf/install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	[[ -x /usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
author	Parabola <dev@list.parabolagnulinux.org>	2012-05-28 20:14:47 +0000
committer	Parabola <dev@list.parabolagnulinux.org>	2012-05-28 20:14:47 +0000
commit	edec45419def1b81bd663a2859684ef55ba56269 (patch)
tree	caa3c2d5f4e55b38e7740a39d80a21507679c586 /staging
parent	483f7de4ab6a706517279a24d2efc969f4a1996d (diff)