Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts: community-staging/projectm/PKGBUILD community-testing/evas_generic_loaders-svn/PKGBUILD community-testing/gambas2/PKGBUILD community-testing/gambas3/PKGBUILD community-testing/libextractor/PKGBUILD community-testing/pdf2djvu/PKGBUILD community-testing/qtcreator/PKGBUILD community-testing/qtcreator/qtcreator.desktop community/galculator/PKGBUILD community/ristretto/PKGBUILD core/systemd/PKGBUILD extra/llvm/PKGBUILD extra/pyqt/PKGBUILD extra/python-lxml/PKGBUILD multilib/lib32-util-linux/PKGBUILD staging/glew/PKGBUILD staging/xine-lib/PKGBUILD testing/calligra/PKGBUILD testing/gdk-pixbuf2/PKGBUILD testing/gdm/PKGBUILD testing/gdm/fix_external_program_directories.patch testing/glib2/PKGBUILD testing/gnome-color-manager/PKGBUILD testing/gthumb/PKGBUILD testing/gtk3/PKGBUILD testing/gvfs/PKGBUILD testing/inkscape/PKGBUILD testing/kdebase-workspace/PKGBUILD testing/libreoffice/PKGBUILD testing/networkmanager/PKGBUILD testing/polkit/PKGBUILD testing/poppler/PKGBUILD testing/rhythmbox/PKGBUILD testing/xorg-server/PKGBUILD testing/xorg-xdm/PKGBUILD
author: Michał Masłowski <mtjm@mtjm.eu> 2012-10-21 10:47:37 +0200
committer: Michał Masłowski <mtjm@mtjm.eu> 2012-10-21 10:47:37 +0200
commit: aec9ffe68488d34c02bceb4942b87779f5c460d5 (patch)
tree: 5aaa0d61510bf94c4dd5bd751b53f61d39817e96 /staging
parent: 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (diff)
parent: 9598f5141ea75ffa72a3c7c85639c6f296020ef1 (diff)
107 files changed, 0 insertions, 7372 deletions
diff --git a/staging/bzr/PKGBUILD b/staging/bzr/PKGBUILD
deleted file mode 100644
index 22244baf0..000000000
--- a/staging/bzr/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168772 2012-10-15 21:04:59Z eric $
-# Maintainer :
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=bzr
-pkgver=2.5.1
-pkgrel=2
-pkgdesc="A decentralized revision control system (bazaar)"
-arch=('i686' 'x86_64')
-url="http://bazaar.canonical.com/en/"
-license=('GPL')
-depends=('python2')
-optdepends=('python2-paramiko: for sftp support')
-source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('ac5079858364a046071000d5cdccb67b'
-         'c83dd08dd2c3e27edbab873500d7d6eb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|man/man1|share/man/man1|' setup.py
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-    bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
-  python2 setup.py build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
-
-  # bash-completion
-  install -D -m644 contrib/bash/bzr \
-    "${pkgdir}/usr/share/bash-completion/completions/bzr"
-}
diff --git a/staging/dbus-python/PKGBUILD b/staging/dbus-python/PKGBUILD
deleted file mode 100644
index b6b1bc24f..000000000
--- a/staging/dbus-python/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 168669 2012-10-13 22:15:37Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=dbus-python
-pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common')
-pkgver=1.1.1
-pkgrel=2
-pkgdesc="Python bindings for DBUS"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-url="http://www.freedesktop.org/wiki/Software/DBusBindings"
-makedepends=('docutils' 'dbus-glib' 'python' 'python2')
-options=('!libtool')
-source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz)
-md5sums=('742c7432ad0f7c3f98291d58fa2e35dc')
-
-build() {
-  cd "${srcdir}"
-  mkdir build-python2 build-python3
-  cd "${srcdir}/build-python2"
-  PYTHON=python2 ../${pkgbase}-${pkgver}/configure --prefix=/usr
-  make
-
-
-  cd "${srcdir}/build-python3"
-  ../${pkgbase}-${pkgver}/configure --prefix=/usr
-  make
-}
-
-package_python-dbus-common() {
-  pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus"
-  conflicts=('dbus-python<1.1.0')
-
-  cd "${srcdir}/build-python3"
-  make DESTDIR="${pkgdir}" install-data
-  rm -rf "${pkgdir}"/usr/lib/python*
-}
-
-package_python-dbus() {
-  depends=('python-dbus-common' 'python' 'dbus-core')
-  optdepends=('dbus-glib: glib mainloop support')
-  pkgdesc="Python 3.3 bindings for DBUS"
-
-  cd "${srcdir}/build-python3"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/share"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-}
-
-package_python2-dbus() {
-  depends=('python-dbus-common' 'python2' 'dbus-core')
-  optdepends=('dbus-glib: glib mainloop support')
-  pkgdesc="Python 2.7 bindings for DBUS"
-  replaces=('dbus-python')
-  conflicts=('dbus-python')
-  provides=("dbus-python=$pkgver")
-
-  cd "${srcdir}/build-python2"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/share"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-}
diff --git a/staging/gnome-python-desktop/PKGBUILD b/staging/gnome-python-desktop/PKGBUILD
deleted file mode 100644
index 4788632d1..000000000
--- a/staging/gnome-python-desktop/PKGBUILD
+++ /dev/null
@@ -1,107 +0,0 @@
-# $Id: PKGBUILD 168784 2012-10-16 00:01:27Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@soulfly.nl>
-# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-
-pkgbase=gnome-python-desktop
-pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck')
-pkgver=2.32.0
-pkgrel=11
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-options=('!libtool')
-makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg' 'libwnck')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
-        gnome-python-desktop-2.32.0-metacity-build.patch)
-sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9'
-            'f012f9bd2f9baa527f07ad2f6e312c875bb6f2d3204270a1b053278a3a0c86b3')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  patch -p1 -i ../gnome-python-desktop-2.32.0-metacity-build.patch
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity
-  make
-}
-
-package_gnome-python-desktop() {
-  depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome2-python')
-  pkgdesc="Python bindings for the GNOME desktop environment"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make install-pkgconfigDATA DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomedesktop() {
-  depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs')
-  pkgdesc="Python bindings for gnome-desktop 2.x"
-  conflicts=('python-gnomedesktop<=2.32.0-10')
-  replaces=('python-gnomedesktop<=2.32.0-10')
-  
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomedesktop install DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomekeyring() {
-  depends=('pygtk' 'libgnome-keyring')
-  pkgdesc="Python bindings for libgnome-keyring"
-  conflicts=('python-gnomekeyring<=2.32.0-10')
-  replaces=('python-gnomekeyring<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomekeyring install DESTDIR="${pkgdir}"
-}
-
-package_python2-gtop() {
-  depends=('pygtk' 'libgtop')
-  pkgdesc="Python bindings for libgtop"
-  conflicts=('python-gtop<=2.32.0-10')
-  replaces=('python-gtop<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gtop install DESTDIR="${pkgdir}"
-}
-
-package_python2-metacity() {
-  depends=('pygtk' 'metacity')
-  pkgdesc="Python bindings for metacity"
-  conflicts=('python-metacity<=2.32.0-10')
-  replaces=('python-metacity<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C metacity install DESTDIR="${pkgdir}"
-}
-
-package_python2-rsvg() {
-  depends=('pygtk' 'librsvg')
-  pkgdesc="Python bindings for librsvg"
-  conflicts=('python-rsvg<=2.32.0-10')
-  replaces=('python-rsvg<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C rsvg install DESTDIR="${pkgdir}"
-  install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs"
-  install -m644 rsvg/rsvg.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
-}
-
-package_python2-totem-plparser() {
-  depends=('pygtk' 'totem-plparser' 'python2-gnomevfs')
-  pkgdesc="Python bindings for totem-plparser"
-  conflicts=('python-totem-plparser<=2.32.0-10')
-  replaces=('python-totem-plparser<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C totem install DESTDIR="${pkgdir}"
-  install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs"
-  install -m644 totem/plparser.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
-}
-
-package_python2-wnck() {
-  depends=('pygtk' 'libwnck')
-  pkgdesc="Python bindings for libwnck"
-  conflicts=('python-wnck<=2.32.0-10')
-  replaces=('python-wnck<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C wnck install DESTDIR="${pkgdir}"
-}
diff --git a/staging/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch b/staging/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch
deleted file mode 100644
index 5054dd2bd..000000000
--- a/staging/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Daniel Drake <dsd@laptop.org>
-
-Fix build against metacity-2.34.2. The port to GSettings
-removed these constants from the codebase.
-
-Index: gnome-python-desktop-2.32.0/metacity/metacity.defs
-===================================================================
---- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs
-+++ gnome-python-desktop-2.32.0/metacity/metacity.defs
-@@ -120,32 +120,6 @@
-   )
- )
- 
--(define-enum FocusMode
--  (in-module "Meta")
--  (c-name "MetaFocusMode")
--;   (gtype-id "META_TYPE_FOCUS_MODE")
--  (values
--    '("click" "META_FOCUS_MODE_CLICK")
--    '("sloppy" "META_FOCUS_MODE_SLOPPY")
--    '("mouse" "META_FOCUS_MODE_MOUSE")
--  )
--)
--
--(define-enum ActionTitlebar
--  (in-module "Meta")
--  (c-name "MetaActionTitlebar")
--;   (gtype-id "META_TYPE_ACTION_TITLEBAR")
--  (values
--    '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE")
--    '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE")
--    '("minimize" "META_ACTION_TITLEBAR_MINIMIZE")
--    '("none" "META_ACTION_TITLEBAR_NONE")
--    '("lower" "META_ACTION_TITLEBAR_LOWER")
--    '("menu" "META_ACTION_TITLEBAR_MENU")
--    '("last" "META_ACTION_TITLEBAR_LAST")
--  )
--)
--
- (define-enum FrameType
-   (in-module "Meta")
-   (c-name "MetaFrameType")
diff --git a/staging/kdebase-workspace/etc-scripts.patch b/staging/kdebase-workspace/etc-scripts.patch
deleted file mode 100644
index 903a90a53..000000000
--- a/staging/kdebase-workspace/etc-scripts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
- 
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
-   for file in "$prefix"*.sh; do
diff --git a/staging/kdebase-workspace/kdm.logrotate b/staging/kdebase-workspace/kdm.logrotate
deleted file mode 100644
index 34331feae..000000000
--- a/staging/kdebase-workspace/kdm.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/kdm.log {
-    maxage 365
-    size=+1024k
-    notifempty
-    missingok
-}
diff --git a/staging/kdebase-workspace/logind-support.patch b/staging/kdebase-workspace/logind-support.patch
deleted file mode 100644
index 9de205400..000000000
--- a/staging/kdebase-workspace/logind-support.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Lukas Tinkl <lukas@kde.org>
-Date: Fri, 05 Oct 2012 09:57:13 +0000
-Subject: store the filedescriptor in a member variable
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=a18b78d7da8cb8d627ad2e85f666bfcf1a2721e1
----
-store the filedescriptor in a member variable
-
-make systemd-inhibit work as intended, PowerDevil now handles
-power/sleep/lid buttons as intended
-
-BUG: 307412
----
-
-
---- a/powerdevil/daemon/powerdevilpolicyagent.cpp
-+++ b/powerdevil/daemon/powerdevilpolicyagent.cpp
-@@ -29,7 +29,6 @@
- #include <QtDBus/QDBusPendingReply>
- #include <QtDBus/QDBusConnectionInterface>
- #include <QtDBus/QDBusServiceWatcher>
--#include <QtDBus/QDBusUnixFileDescriptor>
- 
- #include <KGlobal>
- #include <KDebug>
-@@ -225,6 +224,9 @@
-         onActiveSessionChanged(m_activeSessionPath);
- 
-         // inhibit systemd handling of power/sleep/lid buttons
-+        // http://www.freedesktop.org/wiki/Software/systemd/inhibit
-+        kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing);
-+
-         QVariantList args;
-         args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
-         args << "PowerDevil"; // who
-@@ -232,8 +234,9 @@
-         args << "block"; // mode
-         QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args);
-         desc.waitForFinished();
--        if (desc.isValid() && desc.value().isValid()) {
--            kDebug() << "systemd powersave events handling inhibited";
-+        if (desc.isValid()) {
-+            m_systemdInhibitFd = desc.value();
-+            kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor();
-         }
-         else
-             kWarning() << "failed to inhibit systemd powersave handling";
-
---- a/powerdevil/daemon/powerdevilpolicyagent.h
-+++ b/powerdevil/daemon/powerdevilpolicyagent.h
-@@ -27,6 +27,7 @@
- #include <QtCore/QWeakPointer>
- 
- #include <QtDBus/QDBusContext>
-+#include <QtDBus/QDBusUnixFileDescriptor>
- 
- #include <kdemacros.h>
- 
-@@ -108,6 +109,7 @@
-     QString m_activeSessionPath;
-     QWeakPointer< QDBusInterface > m_sdSessionInterface;
-     QWeakPointer< QDBusInterface > m_sdSeatInterface;
-+    QDBusUnixFileDescriptor m_systemdInhibitFd;
- 
-     // ConsoleKit support
-     bool m_ckAvailable;
-
diff --git a/staging/kdebindings-python/pyqt495.patch b/staging/kdebindings-python/pyqt495.patch
deleted file mode 100644
index b8a9df258..000000000
--- a/staging/kdebindings-python/pyqt495.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Mon, 01 Oct 2012 18:47:56 +0000
-Subject: Remove duplicated QVector<int> definition, since it's in PyQt now.
-X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&amp;a=commitdiff&amp;h=017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
----
-Remove duplicated QVector<int> definition, since it's in PyQt now.
-Simon, if you have time, please review if everything is OK.
-
-CCMAIL: simon@simonzone.com
----
-
-
---- a/sip/kdecore/typedefs.sip
-+++ b/sip/kdecore/typedefs.sip
-@@ -951,78 +951,4 @@
- %End
- };
- 
--%MappedType QVector<int>
--{
--%TypeHeaderCode
--#include <qvector.h>
--%End
--
--%ConvertFromTypeCode
--    // Create the list.
--    PyObject *l;
--
--    if ((l = PyList_New(sipCpp->size())) == NULL)
--        return NULL;
--
--    // Set the list elements.
--    for (int i = 0; i < sipCpp->size(); ++i)
--    {
--        int t = (sipCpp->at(i));
--
--#if PY_MAJOR_VERSION >= 3        
--        PyObject *tobj = PyLong_FromLong(t);
--#else
--        PyObject *tobj = PyInt_FromLong(t);
--#endif
--
--        PyList_SET_ITEM(l, i, tobj);
--    }
--
--    return l;
--%End
--
--%ConvertToTypeCode
--    // Check the type if that is all that is required.
--    if (sipIsErr == NULL)
--    {
--        if (!PyList_Check(sipPy))
--            return 0;
--
--        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
--#if PY_MAJOR_VERSION >= 3
--            if (!PyNumber_Check(tobj))
--#else
--            if (!PyInt_Check(tobj))
--#endif
--                return 0;
--        }
--        return 1;
--    }
--
--    QVector<int> *qv = new QVector<int>;
-- 
--    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--    {
--        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-- #if PY_MAJOR_VERSION >= 3
--        int t = PyLong_AsLong (tobj);
--#else
--        int t = PyInt_AS_LONG (tobj);
--#endif
--
--        if (*sipIsErr)
--        {
--            delete qv;
--            return 0;
--        }
--
--        qv->append(t);
--    }
-- 
--    *sipCppPtr = qv;
-- 
--    return sipGetState(sipTransferObj);
--%End
--};
--
-+
-
diff --git a/staging/konversation/PKGBUILD b/staging/konversation/PKGBUILD
deleted file mode 100644
index ee8a55574..000000000
--- a/staging/konversation/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 168681 2012-10-14 00:39:34Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: James Rayner <iphitus@gmail.com>
-# Contributor: Sergio Jovani Guzman <moret@paretux.org>
-
-pkgname=konversation
-pkgver=1.4
-pkgrel=3
-pkgdesc="A user friendly IRC client for KDE"
-arch=('i686' 'x86_64')
-url="http://konversation.kde.org"
-depends=('kdebase-runtime' 'kdepimlibs')
-makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml')
-optdepends=('python: python scripting support')
-license=('GPL2' 'FDL')
-install=${pkgname}.install
-options=('!makeflags')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-  
-  # Remove a bunch of symlinks pointing to non-existant files
-  for _lang in pt_BR uk sv et de en nl; do
-     rm "${pkgdir}"/usr/share/doc/kde/html/${_lang}/konversation/common
-  done
-}
diff --git a/staging/konversation/konversation.install b/staging/konversation/konversation.install
deleted file mode 100644
index 8834e059a..000000000
--- a/staging/konversation/konversation.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/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/staging/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
deleted file mode 100644
index e86548136..000000000
--- a/staging/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
-index defd7b2..ea2a809 100755
---- a/desktop/scripts/soffice.sh
-+++ b/desktop/scripts/soffice.sh
-@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then
-     exit 1;
- fi
- 
-+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
-+export PYTHONPATH
-+
- case "`uname -s`" in
- NetBSD|OpenBSD|FreeBSD|DragonFly)
- # this is a temporary hack until we can live with the default search paths
-diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
-index f93ac5e..92a2891 100644
---- a/pyuno/source/module/uno.py
-+++ b/pyuno/source/module/uno.py
-@@ -26,8 +26,12 @@
- # for a copy of the LGPLv3 License.
- #
- #*************************************************************************
-+import os
- import sys
- 
-+sys.path.append('/usr/lib/libreoffice/program')
-+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
-+     os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc"
- import pyuno
- 
- try:
-diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
-index 610ac5f..df243d0 100755
---- a/scripting/source/pyprov/officehelper.py
-+++ b/scripting/source/pyprov/officehelper.py
-@@ -53,7 +53,7 @@ def bootstrap():
-         if "UNO_PATH" in os.environ:
-             sOffice = os.environ["UNO_PATH"]
-         else:
--            sOffice = "" # lets hope for the best
-+            sOffice = "/usr/lib/libreoffice/program"
-         sOffice = os.path.join(sOffice, "soffice")
-         if platform.startswith("win"): 
-             sOffice += ".exe"
diff --git a/staging/libxcb/PKGBUILD b/staging/libxcb/PKGBUILD
deleted file mode 100644
index 2ca76afe7..000000000
--- a/staging/libxcb/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 168070 2012-10-05 16:55:34Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=libxcb
-pkgver=1.9
-pkgrel=1
-pkgdesc="X11 client-side library"
-arch=(i686 x86_64)
-url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.7' 'libxdmcp' 'libxau')
-makedepends=('pkgconfig' 'libxslt' 'python2')
-options=('!libtool')
-license=('custom')
-source=($url/dist/$pkgname-$pkgver.tar.bz2
-        libxcb-1.1-no-pthread-stubs.patch)
-sha1sums=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061'
-          'd2df03ddf3e949c10c2c185256b0eb7fa02837ab')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch"
-  PYTHON=/usr/bin/python2 
-  ./autogen.sh --prefix=/usr \
-    --enable-xinput \
-    --disable-static
-  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/libxcb/libxcb-1.1-no-pthread-stubs.patch b/staging/libxcb/libxcb-1.1-no-pthread-stubs.patch
deleted file mode 100644
index 8e8162f0a..000000000
--- a/staging/libxcb/libxcb-1.1-no-pthread-stubs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxcb-1.8.1/configure.ac	2012-03-09 15:38:38.000000000 +0100
-+++ libxcb-1.8.1/configure.ac.new	2012-03-09 16:50:40.107109896 +0100
-@@ -35,7 +35,7 @@
- 
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7)
--NEEDED="pthread-stubs xau >= 0.99.2"
-+NEEDED="xau >= 0.99.2"
- PKG_CHECK_MODULES(NEEDED, $NEEDED)
- 
- have_xdmcp="no"
diff --git a/staging/mesa/mesa-radeon-parallel-make.diff b/staging/mesa/mesa-radeon-parallel-make.diff
deleted file mode 100644
index 2fc5a4793..000000000
--- a/staging/mesa/mesa-radeon-parallel-make.diff
+++ /dev/null
@@ -1,129 +0,0 @@
-From cebbdd4ac23725963207bf6f8fc7101150e6065f Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Wed, 29 Aug 2012 13:01:15 +0000
-Subject: radeon/llvm: Cleanup makefile
-
-Hopefully, this will fix all the parallel make problems people have
-been having.
----
-diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile
-index 43f668a..7f1c613 100644
---- a/src/gallium/drivers/radeon/Makefile
-+++ b/src/gallium/drivers/radeon/Makefile
-@@ -20,8 +20,6 @@ tablegen = $(TBLGEN) -I $(LLVM_INCLUDEDIR) $1 $2 -o $3
- 
- HAVE_LLVM_INTRINSICS = $(shell grep IntrinsicsR600.td $(LLVM_INCLUDEDIR)/llvm/Intrinsics.td)
- 
--gen: $(GENERATED_SOURCES)
--
- SIRegisterInfo.td: SIGenRegisterInfo.pl
- 	$(PERL) $^ > $@
- 
-@@ -38,37 +36,37 @@ endif
- R600RegisterInfo.td: R600GenRegisterInfo.pl
- 	$(PERL) $^ > $@
- 
--AMDGPUGenRegisterInfo.inc: *.td
-+AMDGPUGenRegisterInfo.inc: $(TD_FILES)
- 	$(call tablegen, -gen-register-info, AMDGPU.td, $@)
- 
--AMDGPUGenInstrInfo.inc: *.td
-+AMDGPUGenInstrInfo.inc: $(TD_FILES)
- 	$(call tablegen, -gen-instr-info, AMDGPU.td, $@)
- 
--AMDGPUGenAsmWriter.inc: *.td
-+AMDGPUGenAsmWriter.inc: $(TD_FILES)
- 	$(call tablegen, -gen-asm-writer, AMDGPU.td, $@)
- 
--AMDGPUGenDAGISel.inc: *.td
-+AMDGPUGenDAGISel.inc: $(TD_FILES)
- 	$(call tablegen, -gen-dag-isel, AMDGPU.td, $@)
- 
--AMDGPUGenCallingConv.inc: *.td
-+AMDGPUGenCallingConv.inc: $(TD_FILES)
- 	$(call tablegen, -gen-callingconv, AMDGPU.td, $@)
- 
--AMDGPUGenSubtargetInfo.inc: *.td
-+AMDGPUGenSubtargetInfo.inc: $(TD_FILES)
- 	$(call tablegen, -gen-subtarget, AMDGPU.td, $@)
- 
--AMDGPUGenEDInfo.inc: *.td
-+AMDGPUGenEDInfo.inc: $(TD_FILES)
- 	$(call tablegen, -gen-enhanced-disassembly-info, AMDGPU.td, $@)
- 
--AMDGPUGenIntrinsics.inc: *.td
-+AMDGPUGenIntrinsics.inc: $(TD_FILES)
- 	$(call tablegen, -gen-tgt-intrinsic, AMDGPU.td, $@)
- 
--AMDGPUGenCodeEmitter.inc: *.td
-+AMDGPUGenCodeEmitter.inc: $(TD_FILES)
- 	$(call tablegen, -gen-emitter, AMDGPU.td, $@)
- 
--AMDGPUGenMCCodeEmitter.inc: *.td
-+AMDGPUGenMCCodeEmitter.inc: $(TD_FILES)
- 	$(call tablegen, -mc-emitter -gen-emitter, AMDGPU.td, $@)
- 
--AMDGPUGenDFAPacketizer.inc: *.td
-+AMDGPUGenDFAPacketizer.inc: $(TD_FILES)
- 	$(call tablegen, -gen-dfa-packetizer, AMDGPU.td, $@)
- 
- LOADER_LIBS=$(shell llvm-config --libs bitreader asmparser)
-diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
-index 2eb1120..333dd03 100644
---- a/src/gallium/drivers/radeon/Makefile.sources
-+++ b/src/gallium/drivers/radeon/Makefile.sources
-@@ -1,4 +1,30 @@
- 
-+TD_FILES := \
-+	AMDGPU.td		\
-+	AMDGPUInstrInfo.td	\
-+	AMDGPUInstructions.td	\
-+	AMDGPUIntrinsics.td	\
-+	AMDGPURegisterInfo.td	\
-+	AMDILBase.td		\
-+	AMDILInstrInfo.td	\
-+	AMDILIntrinsics.td	\
-+	AMDILRegisterInfo.td	\
-+	Processors.td		\
-+	R600InstrInfo.td	\
-+	R600Instructions.td	\
-+	R600Intrinsics.td	\
-+	R600IntrinsicsNoOpenCL.td	\
-+	R600IntrinsicsOpenCL.td	\
-+	R600RegisterInfo.td	\
-+	R600Schedule.td		\
-+	SIInstrFormats.td	\
-+	SIInstrInfo.td		\
-+	SIInstructions.td	\
-+	SIIntrinsics.td		\
-+	SIRegisterInfo.td	\
-+	SISchedule.td
-+
-+
- GENERATED_SOURCES := \
- 	R600Intrinsics.td		\
- 	R600RegisterInfo.td		\
---
-cgit v0.9.0.2-2-gbebe
-From 2baaa5c7eb21517f0197bfd91154e9b4886fbb1b Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Thu, 06 Sep 2012 14:05:22 +0000
-Subject: radeon/llvm: Remove R600InstrInfo.td from TD_FILES
-
-Fixes build bug introduced by
-cebbdd4ac23725963207bf6f8fc7101150e6065f
----
-diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
-index 333dd03..f387636 100644
---- a/src/gallium/drivers/radeon/Makefile.sources
-+++ b/src/gallium/drivers/radeon/Makefile.sources
-@@ -10,7 +10,6 @@ TD_FILES := \
- 	AMDILIntrinsics.td	\
- 	AMDILRegisterInfo.td	\
- 	Processors.td		\
--	R600InstrInfo.td	\
- 	R600Instructions.td	\
- 	R600Intrinsics.td	\
- 	R600IntrinsicsNoOpenCL.td	\
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/mesa/pthread_fix.diff b/staging/mesa/pthread_fix.diff
deleted file mode 100644
index bdfe2d865..000000000
--- a/staging/mesa/pthread_fix.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From dd4fde8f674f5e3efa19e929f97de4ecfd82391b Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Thu, 27 Sep 2012 22:49:52 +0000
-Subject: build: Set PTHREAD_LIBS for pkgconfig files if empty
-
----
-diff --git a/configure.ac b/configure.ac
-index 770df2f..dc2720d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -509,6 +509,10 @@ AC_CHECK_DECLS([signbit],[],
- 
- dnl Check for pthreads
- AX_PTHREAD
-+dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS
-+dnl to -pthread, which causes problems if we need -lpthread to appear in
-+dnl pkgconfig files.
-+test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
- 
- dnl SELinux awareness.
- AC_ARG_ENABLE([selinux],
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/miro/PKGBUILD b/staging/miro/PKGBUILD
deleted file mode 100644
index 1b4c5711a..000000000
--- a/staging/miro/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 168800 2012-10-16 01:40:22Z eric $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=miro
-pkgver=5.0.4
-pkgrel=2
-pkgdesc="The free and open source internet TV platform"
-arch=('i686' 'x86_64')
-url="http://www.getmiro.com"
-license=('GPL2')
-depends=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
-         'python2-pysqlite' 'pywebkitgtk' 'shared-mime-info'
-         'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
-         'gstreamer0.10-python' 'python2-notify' 'libtorrent-rasterbar'
-         'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python2-pycurl' 
-         'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils')
-makedepends=('pkg-config' 'boost')
-install=miro.install
-source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz"
-        'ffmpeg.patch')
-sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f'
-          'ce0f42be2a0a3ac99f07b5abfabf0975928c841c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  cd linux
-  patch -p2 -i "${srcdir}"/ffmpeg.patch
-
-  python2 setup.py install --root="${pkgdir}"
-
-  # fix miro startup script so --debug works with python2
-  sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
-  sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
-
-  # fix python scripts for python2
-  sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}"/usr/share/miro/resources/searchengines/update-icons.py
-  for i in usr/share/miro/resources/testdata/echonest-replies/generate.py usr/share/miro/resources/searchengines/update-icons.py \
-    usr/share/miro/resources/testdata/7digital-replies/generate.py; do
-    sed -i "s|/usr/bin/python|/usr/bin/python2|" "${pkgdir}"/${i} 
-  done
-
-  # Fakeroot segfaults on these; remove
-  if [ ${CARCH} == "i686" ]; then
-    rm -f "${pkgdir}"/usr/bin/codegen.Linux-x86_64 || true
-  else
-    rm -f "${pkgdir}"/usr/bin/codegen.Linux-i686 || true
-  fi
-}
diff --git a/staging/miro/ffmpeg.patch b/staging/miro/ffmpeg.patch
deleted file mode 100644
index 99c14107d..000000000
--- a/staging/miro/ffmpeg.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- miro-5.0.1/linux/miro-segmenter.c~	2012-07-06 14:33:24.618082171 +0000
-+++ miro-5.0.1/linux/miro-segmenter.c	2012-07-06 15:10:19.564146117 +0000
-@@ -156,7 +156,7 @@
-         exit(1);
-     }
- 
--    ret = av_open_input_file(&ic, input, ifmt, 0, NULL);
-+    ret = avformat_open_input(&ic, input, ifmt, 0);
-     if (ret != 0) {
-         fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret);
-         exit(1);
-@@ -215,12 +215,7 @@
-         }
-     }
- 
--    if (av_set_parameters(oc, NULL) < 0) {
--        fprintf(stderr, "Invalid output format parameters\n");
--        exit(1);
--    }
--
--    dump_format(oc, 0, input, 1);
-+    av_dump_format(oc, 0, input, 1);
- 
-     if (video_st) {
-         codec = avcodec_find_decoder(video_st->codec->codec_id);
-@@ -233,12 +228,12 @@
-         }
-     }
- 
--    if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+    if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
-         fprintf(stderr, "Could not open '%s'\n", output_filename);
-         exit(1);
-     }
- 
--    if (av_write_header(oc)) {
-+    if (avformat_write_header(oc, NULL)) {
-         fprintf(stderr, "Could not write mpegts header to first output file\n");
- 
-         exit(1);
-@@ -274,10 +269,10 @@
-         }
- 
-         if (segment_time - prev_segment_time >= segment_duration) {
--            put_flush_packet(oc->pb);
--            url_fclose(oc->pb);
-+            avio_flush(oc->pb);
-+            avio_close(oc->pb);
- 
--            if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+            if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
-                 fprintf(stderr, "Could not open '%s'\n", output_filename);
-                 break;
-             }
-@@ -307,7 +302,7 @@
-         av_freep(&oc->streams[i]);
-     }
- 
--    url_fclose(oc->pb);
-+    avio_close(oc->pb);
-     av_free(oc);
- 
-     /* End-of-transcode marker. */
diff --git a/staging/miro/miro.install b/staging/miro/miro.install
deleted file mode 100644
index a5ee228aa..000000000
--- a/staging/miro/miro.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  xdg-icon-resource forceupdate --theme hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-  xdg-icon-resource forceupdate --theme hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-
diff --git a/staging/pathological/PKGBUILD b/staging/pathological/PKGBUILD
deleted file mode 100644
index acf263add..000000000
--- a/staging/pathological/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 167400 2012-10-01 23:04:53Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=pathological
-pkgver=1.1.3
-pkgrel=8
-pkgdesc="A puzzle game with the same feel as frozen bubble"
-arch=('i686' 'x86_64')
-url="http://pathological.sourceforge.net/"
-license=('GPL')
-depends=('python2-pygame')
-makedepends=('netpbm')
-install=pathological.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        pathological.desktop pygame_181.patch encoding.patch)
-sha1sums=('70b1c9e12704c7fd3b301aa90bceee2e8373b7b9'
-          '9b57f854ce9621542d810a21c61325de343950d7'
-          '6f0aa0f74a87bd53771f2db6d3117981c4f070d3'
-          '7dbaa9ced7da0094280425a68b4c8db3382f230a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 < ../encoding.patch
-  patch -p1 < ../pygame_181.patch
-  sed -i 's|X11R6/include/X11|share|' Makefile
-  sed -i 's|usr/games|usr/bin|' Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' "${pkgdir}/usr/share/games/pathological/pathological.py"
-  install -D -m644 ../pathological.desktop "${pkgdir}/usr/share/applications/pathological.desktop"
-  chown root:games "${pkgdir}/var/games"
-  chmod 775 "${pkgdir}/var/games"
-  rm "${pkgdir}/var/games/pathological_scores"
-}
diff --git a/staging/pathological/encoding.patch b/staging/pathological/encoding.patch
deleted file mode 100644
index 394875809..000000000
--- a/staging/pathological/encoding.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- pathological.py.orig	2009-07-10 01:49:39.000000000 -0400
-+++ pathological.py	2009-07-10 01:49:53.000000000 -0400
-@@ -1,4 +1,5 @@
- #!/usr/bin/python
-+# -*- coding: utf-8 -*-
- """
- Copyright (C) 2003  John-Paul Gignac
- 
diff --git a/staging/pathological/pathological.desktop b/staging/pathological/pathological.desktop
deleted file mode 100644
index 54817684f..000000000
--- a/staging/pathological/pathological.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Pathological
-Comment=A puzzle game involving paths and marbles
-Exec=pathological
-Icon=pathological.xpm
-Terminal=false
-Type=Application
-Categories=Application;Game;
diff --git a/staging/pathological/pathological.install b/staging/pathological/pathological.install
deleted file mode 100644
index 4bc716839..000000000
--- a/staging/pathological/pathological.install
+++ /dev/null
@@ -1,29 +0,0 @@
-post_install() {
-if [ ! -e var/games/pathological_scores ]; then
-    cat << _EOF > var/games/pathological_scores
-0 all-boards 1 John-Paul
-0 all-boards 1 Kim
-0 all-boards 1 Matths
-0 all-boards 1 Carrie
-0 all-boards 1 Mike
-0 all-boards 1 Dale
-0 all-boards 1 Alesh
-0 all-boards 1 Thanks to
-0 all-boards 1 everyone who
-0 all-boards 1 contributed!
-_EOF
-fi
-  chown root:games var/games/pathological_scores
-  chmod 664 var/games/pathological_scores
-}
-
-pre_upgrade() {
-  if [ -e usr/share/games/pathological/pathological_scores ]; then
-    mv usr/share/games/pathological/pathological_scores var/games/
-  fi
-}
-
-post_upgrade() {
-  chown root:games var/games/pathological_scores
-  chmod 664 var/games/pathological_scores
-}
diff --git a/staging/pathological/pygame_181.patch b/staging/pathological/pygame_181.patch
deleted file mode 100644
index 4789f1519..000000000
--- a/staging/pathological/pygame_181.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pathological-1.1.3.orig.orig/pathological.py	2009-04-15 10:50:11.000000000 -0400
-+++ pathological-1.1.3.orig/pathological.py	2009-04-15 10:50:56.000000000 -0400
-@@ -169,6 +169,7 @@
- 	if not pygame.mixer or not pygame.mixer.music:
- 		print "Background music not available."
- 		return
-+	pygame.mixer.music.stop()
- 	fullname = os.path.join('music', name)
- 	try:
- 		pygame.mixer.music.load(fullname)
diff --git a/staging/pycrypto/PKGBUILD b/staging/pycrypto/PKGBUILD
deleted file mode 100644
index d4987b4b3..000000000
--- a/staging/pycrypto/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 168667 2012-10-13 21:58:25Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Kritoke <kritoke@gamebox.net>
-
-pkgbase=pycrypto
-pkgname=('python2-crypto' 'python-crypto')
-pkgver=2.6
-pkgrel=3
-arch=('i686' 'x86_64')
-makedepends=('python2' 'python')
-url="http://www.dlitz.net/software/pycrypto/"
-license=('custom')
-source=("http://ftp.dlitz.net/pub/dlitz/crypto/${pkgbase}/${pkgbase}-${pkgver}.tar.gz")
-sha256sums=('7293c9d7e8af2e44a82f86eb9c3b058880f4bcc884bf3ad6c8a34b64986edde8')
-
-build() {
-  cd "${srcdir}"
-  find ${pkgbase}-${pkgver}/LEGAL -type f -exec chmod 644 {} \;
-  find ${pkgbase}-${pkgver}/LEGAL -type d -exec chmod 755 {} \;
- 
-  cp -r ${pkgbase}-${pkgver} ${pkgbase}-${pkgver}-py3
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  python2 setup.py build
-
-  cd "${srcdir}/${pkgbase}-${pkgver}-py3"
-  python setup.py build
-}
-
-package_python2-crypto() {
-  pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 2."
-  depends=('python2')
-  replaces=('pycrypto')
-  conflicts=('pycrypto')
-  provides=("pycrypto=${pkgver}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/"
-  cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
-
-package_python-crypto() {
-  pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 3."
-  depends=('python')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}-py3"
-  python setup.py install --root="${pkgdir}" --optimize=1
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/"
-  cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/pygobject/PKGBUILD b/staging/pygobject/PKGBUILD
deleted file mode 100644
index c5b861096..000000000
--- a/staging/pygobject/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 168794 2012-10-16 00:45:16Z allan $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=pygobject
-pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.2.2
-pkgrel=2
-arch=('i686' 'x86_64')
-url="https://live.gnome.org/PyGObject"
-license=('LGPL')
-makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-options=('!libtool')
-sha256sums=('4653790baaff0176fd814b88cfb5378c45906a120b25d01be2554f423b726eb0')
-
-build() {
-  cp -a "$pkgbase-$pkgver" python2-build
-  mkdir devel
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr
-    make
-  )
-
-  (
-    cd "$pkgbase-$pkgver"
-    ./configure --prefix=/usr
-    make
-  )
-}
-
-package_python-gobject() {
-  pkgdesc="Python 3 bindings for GObject"
-  depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver")
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm -r "$pkgdir"/usr/{include,lib/pkgconfig}
-}
-
-package_python2-gobject() {
-  pkgdesc="Python 2 bindings for GObject"
-  depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver")
-
-  cd "python2-build"
-  make DESTDIR="$pkgdir" install
-  mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel"
-}
-
-package_pygobject-devel() {
-  pkgdesc="Development files for the pygobject bindings"
-  cd "devel"
-  mkdir -p "$pkgdir"/usr/{include,lib}
-  mv include "$pkgdir/usr/"
-  mv pkgconfig "$pkgdir/usr/lib/"
-}
diff --git a/staging/pygobject2/PKGBUILD b/staging/pygobject2/PKGBUILD
deleted file mode 100644
index 4ba2bfa2a..000000000
--- a/staging/pygobject2/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 168792 2012-10-16 00:40:21Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=pygobject2
-pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
-pkgver=2.28.6
-pkgrel=7
-arch=('i686' 'x86_64')
-url="http://www.pygtk.org/"
-license=('LGPL')
-makedepends=('python' 'python2')
-source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
-        python2-fix-type.patch
-        python3-fix-build.patch
-        python3-fix-maketrans.patch)
-options=('!libtool')
-sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
-            'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea'
-            'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca'
-            '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
-
-build() {
-  cd "${srcdir}"
-  cp -a "pygobject-${pkgver}" python2-build
-  mkdir devel
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr --disable-introspection
-    make
-  )
-
-  (
-    cd "pygobject-${pkgver}"
-    #patches available in 2.28 branch but unreleased.
-    patch -Np1 -i "${srcdir}/python2-fix-type.patch"
-    patch -Np1 -i "${srcdir}/python3-fix-build.patch"
-    patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
-
-    ./configure --prefix=/usr --disable-introspection
-    make
-  )
-}
-
-package_python-gobject2() {
-  pkgdesc="Python 3 bindings for GObject2"
-  depends=('glib2' 'pygobject2-devel' 'python')
-  replaces=('py3gobject')
-  provides=("py3gobject=$pkgver")
-
-  cd "${srcdir}/pygobject-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # Delete devel stuff
-  rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}}
-}
-
-package_python2-gobject2() {
-  pkgdesc="Python 2 bindings for GObject2"
-  depends=('glib2' 'pygobject2-devel' 'python2')
-  replaces=('pygobject')
-  provides=("pygobject=$pkgver")
-
-  cd "${srcdir}/python2-build"
-  make DESTDIR="${pkgdir}" install
-
-  find "$pkgdir"/usr/share/pygobject -name '*.py' | \
-    xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
-
-  # Split devel stuff
-  mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \
-    "$srcdir/devel/"
-}
-
-package_pygobject2-devel() {
-  pkgdesc="Development files for the pygobject bindings"
-
-  cd "${srcdir}/devel"
-  mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject}
-
-  mv include   "$pkgdir/usr/"
-  mv pkgconfig "$pkgdir/usr/lib/"
-  mv gtk-doc   "$pkgdir/usr/share/"
-  mv xsl       "$pkgdir/usr/share/pygobject/"
-}
diff --git a/staging/pygobject2/python2-fix-type.patch b/staging/pygobject2/python2-fix-type.patch
deleted file mode 100644
index 78e7ddfd5..000000000
--- a/staging/pygobject2/python2-fix-type.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Mon, 12 Mar 2012 16:44:14 -0400
-Subject: gio-types.defs: change some enums to flags
-
-These flags types were originally incorrectly handled in glib as being
-enums.  That bug was fixed, but they're still enums here, leading to
-warnings about the mismatch.
-
-Change them to flags.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=668522
----
- gio/gio-types.defs |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gio/gio-types.defs b/gio/gio-types.defs
-index 331e0bc..7eee5c8 100644
---- a/gio/gio-types.defs
-+++ b/gio/gio-types.defs
-@@ -526,7 +526,7 @@
-   )
- )
- 
--(define-enum MountMountFlags
-+(define-flags MountMountFlags
-   (in-module "gio")
-   (c-name "GMountMountFlags")
-   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
-@@ -545,7 +545,7 @@
-   )
- )
- 
--(define-enum DriveStartFlags
-+(define-flags DriveStartFlags
-   (in-module "gio")
-   (c-name "GDriveStartFlags")
-   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
-@@ -770,7 +770,7 @@
-   )
- )
- 
--(define-enum SocketMsgFlags
-+(define-flags SocketMsgFlags
-   (in-module "gio")
-   (c-name "GSocketMsgFlags")
-   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
--- 
-1.7.9.1
-
diff --git a/staging/pygobject2/python3-fix-build.patch b/staging/pygobject2/python3-fix-build.patch
deleted file mode 100644
index 4cb8cfe57..000000000
--- a/staging/pygobject2/python3-fix-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001
-From: Ignacio Casal Quinteiro <icq@gnome.org>
-Date: Thu, 21 Apr 2011 14:52:20 +0000
-Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore
-
----
-diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c
-index 81b9865..edf52d7 100644
---- a/gi/pygi-foreign-cairo.c
-+++ b/gi/pygi-foreign-cairo.c
-@@ -30,7 +30,7 @@
- #include <pycairo/py3cairo.h>
- #endif
- 
--Pycairo_CAPI_t *Pycairo_CAPI;
-+static Pycairo_CAPI_t *Pycairo_CAPI;
- 
- #include "pygi-foreign.h"
- 
-@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info,
- static PyMethodDef _gi_cairo_functions[] = {0,};
- PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo")
- {
-+#if PY_VERSION_HEX < 0x03000000
-     Pycairo_IMPORT;
-+#else
-+    Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI");
-+#endif
-+
-     if (Pycairo_CAPI == NULL)
-         return PYGLIB_MODULE_ERROR_RETURN;
- 
---
-cgit v0.9
diff --git a/staging/pygobject2/python3-fix-maketrans.patch b/staging/pygobject2/python3-fix-maketrans.patch
deleted file mode 100644
index f5bc0e77c..000000000
--- a/staging/pygobject2/python3-fix-maketrans.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Wed, 13 Jul 2011 06:42:22 +0000
-Subject: [python3] Fix maketrans import
-
-Python3 moved the maketrans() function from the string module to a str method.
-This unbreaks gi/module.py for Python 3 again.
----
-diff --git a/gi/module.py b/gi/module.py
-index 70df76c..d56bdaf 100644
---- a/gi/module.py
-+++ b/gi/module.py
-@@ -24,7 +24,11 @@ from __future__ import absolute_import
- 
- import os
- import gobject
--import string
-+try:
-+    maketrans = ''.maketrans
-+except AttributeError:
-+    # fallback for Python 2
-+    from string import maketrans
- 
- import gi
- from .overrides import registry
-@@ -124,7 +128,7 @@ class IntrospectionModule(object):
-                 # Don't use upper() here to avoid locale specific
-                 # identifier conversion (e. g. in Turkish 'i'.upper() == 'i')
-                 # see https://bugzilla.gnome.org/show_bug.cgi?id=649165
--                ascii_upper_trans = string.maketrans(
-+                ascii_upper_trans = maketrans(
-                         'abcdefgjhijklmnopqrstuvwxyz', 
-                         'ABCDEFGJHIJKLMNOPQRSTUVWXYZ')
-                 for value_info in info.get_values():
---
-cgit v0.9
diff --git a/staging/pyopenssl/PKGBUILD b/staging/pyopenssl/PKGBUILD
deleted file mode 100644
index 12bf75be8..000000000
--- a/staging/pyopenssl/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 168651 2012-10-13 20:29:33Z eric $
-# Maintainer : Ionut Biru<ibiru@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgbase=pyopenssl
-pkgname=('python-pyopenssl' 'python2-pyopenssl')
-pkgver=0.13
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/pyOpenSSL"
-license=('LGPL2.1')
-makedepends=('python' 'python2' 'openssl')
-source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz)
-md5sums=('767bca18a71178ca353dff9e10941929')
-
-build() {
-    cd "${srcdir}"
-    cp -a "pyOpenSSL-${pkgver}"{,-python2}
-
-    #build python 3 module
-    cd "pyOpenSSL-${pkgver}"
-    python setup.py build
-
-    #build python 2 module
-    cd ../"pyOpenSSL-${pkgver}-python2"
-    python2 setup.py build
-}
-
-package_python-pyopenssl(){
-    pkgdesc="Python3 wrapper module around the OpenSSL library"
-    depends=('python>=3.3' 'openssl')
-    replaces=('pyopenssl')
-    provides=('pyopenssl')
-    conflicts=('pyopenssl')
-
-    cd "${srcdir}/pyOpenSSL-${pkgver}"
-    python setup.py install --root "${pkgdir}" --optimize=1
-}
-
-package_python2-pyopenssl(){
-    pkgdesc="Python2 wrapper module around the OpenSSL library"
-    depends=('python2>=2.7' 'openssl')
-
-    cd "${srcdir}/pyOpenSSL-${pkgver}-python2"
-    python2 setup.py install --root "${pkgdir}" --optimize=1
-}
diff --git a/staging/pyqt/PKGBUILD b/staging/pyqt/PKGBUILD
deleted file mode 100644
index 6f3b1a230..000000000
--- a/staging/pyqt/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 168744 2012-10-15 09:20:47Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
-
-pkgbase=pyqt
-pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.9.5
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
-license=('GPL')
-makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
-             'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
-source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('e4cdd6619c63655f7510efb4df8462fb')
-
-build() {
-  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
-
-  cd PyQt-x11-gpl-${pkgver}
-  python configure.py \
-    --confirm-license \
-    --qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-
-  ### Python2 version ###
-  cd ../Py2Qt-x11-gpl-${pkgver}
-  python2 configure.py \
-    --confirm-license \
-    -v /usr/share/sip \
-    --qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-}
-
-package_pyqt-common(){
-  pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
-  
-  cd PyQt-x11-gpl-${pkgver}
-  make -C pyrcc DESTDIR="${pkgdir}" install
-  make -C pylupdate DESTDIR="${pkgdir}" install
-  
-  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
-
-package_pyqt(){
-  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-              'qscintilla: QScintilla API'
-              'qt-assistant-compat: add PyQt online help in Qt Assistant')
-
-  cd PyQt-x11-gpl-${pkgver}
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Provided by pyqt-common
-  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
-
-package_python2-pyqt(){
-  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-              'python2-opengl: enable OpenGL 3D graphics in PyQt applications'
-              'qscintilla: QScintilla API'
-              'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  provides=('python2-qt')
-
-  cd Py2Qt-x11-gpl-${pkgver}
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Fix conflicts with pyqt
-  mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
-  
-  # Provided by pyqt
-  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
diff --git a/staging/python-cairo/PKGBUILD b/staging/python-cairo/PKGBUILD
deleted file mode 100644
index 578fec081..000000000
--- a/staging/python-cairo/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167695 2012-10-03 01:10:24Z stephane $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>  
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=python-cairo
-pkgver=1.10.0
-pkgrel=2
-pkgdesc="Python bindings for the cairo graphics library"
-arch=('i686' 'x86_64')
-license=('LGPL3')
-depends=('python' 'cairo')
-makedepends=('pkg-config')
-options=('!libtool')
-source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2)
-url="http://www.cairographics.org/pycairo"
-md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5')
-
-build() {
-  cd "${srcdir}/pycairo-${pkgver}"
-
-  # Ensure that ./waf has created the cached unpacked version
-  # of the wafadmin source tree.
-  # This will be created to a subdirectory like
-  #    .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752
-  python3 ./waf --version
-
-  ./waf configure --prefix=/usr
-  ./waf build
-}
-
-package() {
-  cd "${srcdir}/pycairo-${pkgver}"
-  ./waf install --destdir="${pkgdir}"
-}
diff --git a/staging/python-egenix-mx-base/PKGBUILD b/staging/python-egenix-mx-base/PKGBUILD
deleted file mode 100644
index f48fd8fb8..000000000
--- a/staging/python-egenix-mx-base/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168671 2012-10-13 23:05:54Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgbase=python-egenix-mx-base
-pkgname=('python2-egenix-mx-base')
-_origname=egenix-mx-base
-pkgver=3.2.4
-pkgrel=2
-pkgdesc="A collection of Python tools"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.egenix.com/products/python/mxBase/"
-makedepends=('python2')
-source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz")
-sha1sums=('22d7fcbd582177f9a43245eadc3644f3b48cc9a7')
-
-build() {
-  cd "${srcdir}/${_origname}-${pkgver}"
-
-  find . -name \*.py -exec sed -i -e "s|^#!.*python|#!/usr/bin/python2|" {} \;
-
-  python2 setup.py build
-}
-
-package_python2-egenix-mx-base() {
-  depends=('python2>=2.7')
-  cd "${srcdir}/${_origname}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --skip-build --optimize=1
-  install -D -m644 COPYRIGHT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/staging/python-iwscan/PKGBUILD b/staging/python-iwscan/PKGBUILD
deleted file mode 100644
index 3abb6747e..000000000
--- a/staging/python-iwscan/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 168715 2012-10-14 20:19:42Z eric $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgbase=python-iwscan
-pkgname=python2-iwscan
-pkgver=20090609
-pkgrel=4
-pkgdesc="A Python interface to iwlist, using the iwlib library"
-arch=('i686' 'x86_64')
-url="http://projects.otaku42.de/browser/python-iwscan"
-license=('LGPL')
-depends=('python2' 'wireless_tools')
-conflicts=('python-iwscan<=20090609-3')
-replaces=('python-iwscan<=20090609-3')
-source=(ftp://ftp.archlinux.org/other/${pkgbase}/${pkgbase}-20090609.tar.gz)
-md5sums=('30fbe8ad3b07e67c1c35db2de16077d8')
-
-build() {
-	cd "${srcdir}/${pkgbase}"
-	python2 setup.py build
-}
-
-package_python2-iwscan() {
-	cd "${srcdir}/${pkgbase}"
-	python2 setup.py install --root="${pkgdir}"
-}
diff --git a/staging/python-lxml/PKGBUILD b/staging/python-lxml/PKGBUILD
deleted file mode 100644
index 33aa7dc70..000000000
--- a/staging/python-lxml/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 168387 2012-10-09 21:43:30Z eric $
-# Maintainer:
-
-pkgname=('python-lxml' 'python2-lxml')
-pkgver=3.0
-pkgrel=1
-pkgdesc="Python binding for the libxml2 and libxslt libraries"
-arch=('i686' 'x86_64')
-license=('BSD' 'custom')
-url="http://lxml.de/"
-makedepends=('python2' 'python' 'libxslt')
-source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
-sha1sums=('8dbbd03a637bb563113cf07049a4d5a109369441'
-          'b38447fd3f9cfb30b4d56ffe3bec42739afb2947')
-
-check() {
-  cd "${srcdir}"/lxml-$pkgver
-  make PYTHON=python2 test
-  make PYTHON=python test
-}
-
-package_python2-lxml() {
-  depends=('python2' 'libxslt')
-  optdepends=('python2-beautifulsoup3: support for parsing not well formed HTML')
-
-  cd "${srcdir}"/lxml-$pkgver
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-
-  install -Dm644 LICENSES.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 doc/licenses/BSD.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
-  install -Dm644 doc/licenses/elementtree.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
-}
-
-package_python-lxml() {
-  depends=('python' 'libxslt')
-
-  cd "${srcdir}"/lxml-$pkgver
-  python setup.py install --root="${pkgdir}" --optimize=1
-
-  install -Dm644 LICENSES.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 doc/licenses/BSD.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
-  install -Dm644 doc/licenses/elementtree.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
-}
diff --git a/staging/python-markupsafe/PKGBUILD b/staging/python-markupsafe/PKGBUILD
deleted file mode 100644
index 0ead0adad..000000000
--- a/staging/python-markupsafe/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 168655 2012-10-13 20:45:16Z eric $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Alex Anthony <alex.anthony28991@gmail.com>
-
-pkgname=('python-markupsafe' 'python2-markupsafe')
-pkgver=0.15
-pkgrel=2
-pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/MarkupSafe"
-license=('custom')
-makedepends=('python-distribute' 'python2-distribute')
-source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
-md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186')
-
-build() {
-  cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver}
-  cd "${srcdir}/MarkupSafe-${pkgver}"
-  python setup.py build
-
-  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
-  python2 setup.py build
-}
-
-package_python-markupsafe() {
-  depends=('python')
-
-  cd "${srcdir}/MarkupSafe-${pkgver}"
-  python setup.py install --root="${pkgdir}" --optimize=1
-
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE"
-}
-
-package_python2-markupsafe() {
-  depends=('python2')
-
-  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE"
-}
diff --git a/staging/python-notify/PKGBUILD b/staging/python-notify/PKGBUILD
deleted file mode 100644
index 6cf46c8dc..000000000
--- a/staging/python-notify/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 168721 2012-10-14 20:45:08Z eric $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-
-pkgbase=python-notify
-pkgname=python2-notify
-pkgver=0.1.1
-pkgrel=12
-pkgdesc="Python bindings for libnotify"
-arch=('i686' 'x86_64')
-url="http://www.galago-project.org/"
-license=('GPL')
-depends=('pygtk>=2.22.0' 'libnotify>=0.7.1')
-makedepends=('python2')
-conflicts=('python-notify<=0.1.1-11')
-replaces=('python-notify<=0.1.1-11')
-options=(!libtool)
-source=(http://www.galago-project.org/files/releases/source/notify-python/notify-python-${pkgver}.tar.gz
-        libnotify07.patch
-        notify-python-0.1.1-fix-GTK-symbols.patch)
-md5sums=('8f0ef0939cc8edd2efd896ce5ba80cf4'
-         'b40c4542575d5aef559908fe60a21634'
-         'c6922028da5951e69a6a0167bdb4461c')
-
-build() {
-    cd "${srcdir}/notify-python-${pkgver}"
-
-    patch -Np1 -i "${srcdir}/libnotify07.patch"
-    patch -Np1 -i "${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch"
-
-    ./configure --prefix=/usr
-
-    # WARNING - we touch src/pynotify.override in build because upstream did not rebuild pynotify.c
-    # from the input definitions, this forces pynotify.c to be regenerated, at some point this can be removed
-    touch src/pynotify.override
-
-    make clean
-    make
-}
-
-package_python2-notify() {
-    cd "${srcdir}/notify-python-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/python-notify/libnotify07.patch b/staging/python-notify/libnotify07.patch
deleted file mode 100644
index 289573d50..000000000
--- a/staging/python-notify/libnotify07.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs
---- notify-python-0.1.1/src/pynotify.defs.notify070	2010-11-02 17:11:14.928179237 -0400
-+++ notify-python-0.1.1/src/pynotify.defs	2010-11-02 17:11:51.153180231 -0400
-@@ -38,7 +38,6 @@
-     '("const-gchar*" "summary")
-     '("const-gchar*" "message" (null-ok) (default "NULL"))
-     '("const-gchar*" "icon" (null-ok) (default "NULL"))
--    '("GtkWidget*" "attach" (null-ok) (default "NULL"))
-   )
- )
- 
-@@ -53,24 +52,6 @@
-   )
- )
- 
--(define-method attach_to_widget
--  (of-object "NotifyNotification")
--  (c-name "notify_notification_attach_to_widget")
--  (return-type "none")
--  (parameters
--    '("GtkWidget*" "attach")
--  )
--)
--
--(define-method attach_to_status_icon
--  (of-object "NotifyNotification")
--  (c-name "notify_notification_attach_to_status_icon")
--  (return-type "none")
--  (parameters
--    '("GtkStatusIcon*" "attach")
--  )
--)
--
- (define-method show
-   (of-object "NotifyNotification")
-   (c-name "notify_notification_show")
diff --git a/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch b/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
deleted file mode 100644
index f985c0136..000000000
--- a/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py
---- notify-python-0.1.1/src/__init__.py.BAD	2010-08-31 09:04:45.353844005 -0400
-+++ notify-python-0.1.1/src/__init__.py	2010-08-31 09:04:49.281844300 -0400
-@@ -1 +1,21 @@
-+"""
-+Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea
-+was to support being linked against different parallel-installable
-+GTK stacks.
-+
-+Unfortunately, python needs to jump through some special hoops in order
-+to share symbols with extension modules, specifically, pygtk, which does
-+link against GTK2.
-+
-+Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL),
-+the result is:
-+libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name'
-+
-+Thanks to David Malcolm for figuring out the workaround.
-+"""
-+import ctypes
-+import sys
-+sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
-+import gtk
-+
- from _pynotify import *
diff --git a/staging/python-pygame/PKGBUILD b/staging/python-pygame/PKGBUILD
deleted file mode 100644
index 2cd71fc35..000000000
--- a/staging/python-pygame/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 167394 2012-10-01 22:41:51Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=python-pygame
-pkgname=python2-pygame
-pkgver=1.9.1
-pkgrel=6
-pkgdesc="Python game library"
-arch=('i686' 'x86_64')
-url="http://www.pygame.org/"
-license=('LGPL')
-depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'python2' 'portmidi')
-source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz \
-        config.patch pygame-v4l.patch)
-sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa'
-          '285815e28705d5a2aea53c9d952d35fddf10dd13'
-          '7e693fb2ef5ef636f9965ba1a4eb854f8b0b5070')
-
-build() {
-  cd "${srcdir}/pygame-${pkgver}release"
-  patch -Np0 -i "${srcdir}/config.patch"
-  patch -Np1 -i "${srcdir}/pygame-v4l.patch"
-}
-
-package_python2-pygame() {
-  cd "${srcdir}/pygame-${pkgver}release"
-  python2 config.py -auto
-  python2 setup.py install --root="${pkgdir}" --prefix=/usr
-
-# Copying the examples and tests
-  cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame"
-  cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests"
-
-  find "${pkgdir}" -type f -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#' {} +
-
-# Fixing permissions
-  chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
-}
diff --git a/staging/python-pygame/config.patch b/staging/python-pygame/config.patch
deleted file mode 100644
index b3dab162c..000000000
--- a/staging/python-pygame/config.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: config_unix.py
-===================================================================
---- config_unix.py	(revision 2567)
-+++ config_unix.py	(working copy)
-@@ -174,7 +174,7 @@
- 
-     for d in DEPS[1:]:
-         if not d.found:
--            if not confirm("""
-+            if "-auto" not in sys.argv and not confirm("""
- Warning, some of the pygame dependencies were not found. Pygame can still
- compile and install, but games that depend on those missing dependencies
- will not run. Would you like to continue the configuration?"""):
-Index: config_msys.py
-===================================================================
---- config_msys.py	(revision 2567)
-+++ config_msys.py	(working copy)
-@@ -283,7 +283,7 @@
-     
-     for d in DEPS[1:]:
-         if not d.found:
--            if not confirm("""
-+            if "-auto" not in sys.argv and not confirm("""
- Warning, some of the pygame dependencies were not found. Pygame can still
- compile and install, but games that depend on those missing dependencies
- will not run. Would you like to continue the configuration?"""):
diff --git a/staging/python-pygame/pygame-v4l.patch b/staging/python-pygame/pygame-v4l.patch
deleted file mode 100644
index 3b5a2b9d2..000000000
--- a/staging/python-pygame/pygame-v4l.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in
-*** pygame-1.9.1release/Setup.in	Thu Jul  2 06:41:56 2009
---- pygame-1.9.1release-v4lpatch//Setup.in	Thu Mar 24 17:31:22 2011
-***************
-*** 34,40 ****
-  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
-  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
-  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
-  
-  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
---- 34,40 ----
-  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
-  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
-  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
-  
-  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
-diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c
-*** pygame-1.9.1release/src/_camera.c	Sun Mar 15 20:30:41 2009
---- pygame-1.9.1release-v4lpatch//src/_camera.c	Thu Mar 24 16:58:18 2011
-***************
-*** 160,179 ****
-  {
-  #if defined(__unix__)
-      if (v4l2_open_device(self) == 0) {
-!         if (v4l_open_device(self) == 0) {
-!             v4l2_close_device(self);
-!             return NULL;
-!         } else {
-!             self->camera_type = CAM_V4L;
-!             if (v4l_init_device(self) == 0) {
-!                 v4l2_close_device(self);
-!                 return NULL;
-!             }
-!             if (v4l_start_capturing(self) == 0) {
-!                 v4l2_close_device(self);
-!                 return NULL;
-!             }
-!         }
-      } else {
-          self->camera_type = CAM_V4L2;
-          if (v4l2_init_device(self) == 0) {
---- 160,167 ----
-  {
-  #if defined(__unix__)
-      if (v4l2_open_device(self) == 0) {
-! 	v4l2_close_device(self);
-!         return NULL;
-      } else {
-          self->camera_type = CAM_V4L2;
-          if (v4l2_init_device(self) == 0) {
-diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h
-*** pygame-1.9.1release/src/camera.h	Fri Oct 10 04:37:10 2008
---- pygame-1.9.1release-v4lpatch//src/camera.h	Thu Mar 24 16:44:32 2011
-***************
-*** 39,45 ****
-  
-      #include <asm/types.h>          /* for videodev2.h */
-  
--     #include <linux/videodev.h>
-      #include <linux/videodev2.h>
-  #endif
-  
---- 39,44 ----
-***************
-*** 51,57 ****
-  #define RGB_OUT 1
-  #define YUV_OUT 2
-  #define HSV_OUT 4
-- #define CAM_V4L 1
-  #define CAM_V4L2 2
-  
-  struct buffer 
---- 50,55 ----
-***************
-*** 111,118 ****
-  int v4l2_close_device (PyCameraObject* self);
-  int v4l2_open_device (PyCameraObject* self);
-  
-- /* internal functions specific to v4l */
-- int v4l_open_device (PyCameraObject* self);
-- int v4l_init_device(PyCameraObject* self);
-- int v4l_start_capturing(PyCameraObject* self);
-  #endif
---- 109,112 ----
diff --git a/staging/python-pyspi/PKGBUILD b/staging/python-pyspi/PKGBUILD
deleted file mode 100644
index e230fd562..000000000
--- a/staging/python-pyspi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168788 2012-10-16 00:26:49Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgbase=python-pyspi
-pkgname=python2-pyspi
-pkgver=0.6.1
-pkgrel=1
-pkgdesc="Python AT-SPI bindings"
-arch=('i686' 'x86_64')
-url="http://people.redhat.com/zcerza/dogtail"
-license=('LGPL')
-depends=('python2' 'at-spi')
-makedepends=('pyrex')
-conflicts=('python-pyspi<=0.6.1-5')
-conflicts=('python-pyspi<=0.6.1-5')
-source=("http://dlc.sun.com/osol/jds/downloads/sources/pyspi-${pkgver}.tar.gz"
-        'pyspi-build.patch')
-md5sums=('def336bd566ea688a06ec03db7ccf1f4'
-         '721f74cbae653a258c00b83acf7dd1da')
-
-build() {
-  cd ${srcdir}/pyspi-${pkgver}
-  patch -Np1 -i ${srcdir}/pyspi-build.patch
-  # Pyrex tells us to use __cinit__ instead of __new__
-  sed -i 's/__new__/__cinit__/' pyspi.pyx
-}
-
-package_python2-pyspi() {
-  cd ${srcdir}/pyspi-${pkgver}
-  python2 setup.py install --root=${pkgdir}
-}
diff --git a/staging/python-pyspi/pyspi-build.patch b/staging/python-pyspi/pyspi-build.patch
deleted file mode 100644
index 3d12c5ed5..000000000
--- a/staging/python-pyspi/pyspi-build.patch
+++ /dev/null
@@ -1,1693 +0,0 @@
-diff -Naur pyspi-0.6.1-old/cspi.pxd pyspi-0.6.1/cspi.pxd
---- pyspi-0.6.1-old/cspi.pxd	2006-08-04 06:27:10.000000000 +1000
-+++ pyspi-0.6.1/cspi.pxd	2009-05-09 15:24:31.000000000 +1000
-@@ -14,9 +14,7 @@
- 
- 	ctypedef struct AccessibleTextRange
- 	ctypedef struct AccessibleKeySet
--	ctypedef enum SPIBoolean:
--		FALSE = 0,
--		TRUE
-+	ctypedef unsigned int SPIBoolean
- 
- 	ctypedef struct AccessibleEvent:
- 		char  *type
-diff -Naur pyspi-0.6.1-old/pyspi.pyx pyspi-0.6.1/pyspi.pyx
---- pyspi-0.6.1-old/pyspi.pyx	2006-10-03 02:46:41.000000000 +1000
-+++ pyspi-0.6.1/pyspi.pyx	2009-05-09 15:24:31.000000000 +1000
-@@ -25,9 +25,15 @@
- cdef class Event (EventBase)
- cdef class DeviceEvent
- 
--ctypedef enum bool:
-+ctypedef unsigned int bool
-+
-+import __builtin__
-+try:
-+	False = __builtin__.False
-+	True = __builtin__.True
-+except AttributeError:
- 	False = 0
--	True
-+	True = 1
- 
- # SPIExceptionCode values:
- (SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) 
-@@ -731,7 +737,7 @@
- 	Wrapper around the low-level cspi.AccessibleComponent_ functions,
- 	giving an OO-style API.
- 	"""
--	def getExtents (self, type=0):
-+	def getExtents (self, key_type=0):
- 		"""
- 		Wraps cspi.AccessibleComponent_getExtents, returning an
- 		(x,y,w,h) tuple.
-@@ -741,7 +747,7 @@
- 		cspi.AccessibleComponent_getExtents (self.__item, &x, &y, &w, &h, type)
- 		return (x, y, w, h)
- 
--	def getPosition (self, type = 0):
-+	def getPosition (self, key_type = 0):
- 		"""
- 		Wraps cspi.AccessibleComponent_getPosition, returning an
- 		(x,y) tuple.
-@@ -991,11 +997,11 @@
- 		Wraps cspi.AccessibleHyperlink_getObject
- 		"""
- 		self.__checkSelf ()
--		cdef Accessible object
--		object = Accessible ()
--		object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i))
--		object.__checkSelf ()
--		return object
-+		cdef Accessible obj
-+		obj = Accessible ()
-+		obj.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i))
-+		obj.__checkSelf ()
-+		return obj
- 
- 	def getURI (self, i):
- 		"""
-@@ -1032,7 +1038,7 @@
- 		cspi.AccessibleImage_getImageSize(self.__item, &w, &h);
- 		return [w, h]
- 
--	def getImagePosition (self, type=0):
-+	def getImagePosition (self, key_type=0):
- 		"""
- 		Wraps cspi.AccessibleImage_getImagePosition, returning a (x,y)
- 		pair
-@@ -1042,7 +1048,7 @@
- 		cspi.AccessibleImage_getImagePosition(self.__item, &x, &y, type)
- 		return [x, y]
- 
--	def getImageExtents (self, type=0):
-+	def getImageExtents (self, key_type=0):
- 		"""
- 		Wraps cspi.AccessibleImage_getImageExtents, returning a
- 		(x,y,w,h) tuple
-@@ -1551,7 +1557,7 @@
- 	cdef cspi.AccessibleDeviceListener *__item
- 	cdef public object modMasks
- 
--	def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED):
-+	def __init__ (self, callback, eventMask = <int> cspi.SPI_KEY_PRESSED | <int> cspi.SPI_KEY_RELEASED):
- 		"""
- 		Registers a python callback function to be called.
- 
-diff -Naur pyspi-0.6.1-old/pyspi.pyx.orig pyspi-0.6.1/pyspi.pyx.orig
---- pyspi-0.6.1-old/pyspi.pyx.orig	1970-01-01 10:00:00.000000000 +1000
-+++ pyspi-0.6.1/pyspi.pyx.orig	2006-10-03 02:46:41.000000000 +1000
-@@ -0,0 +1,1592 @@
-+# Authors:
-+#          Zack Cerza <zcerza@redhat.com>
-+#          Chris Lee <clee@redhat.com>
-+#          Lawrence Lim <llim@redhat.com>
-+#          David Malcolm <dmalcolm@redhat.com>
-+
-+cdef class Registry
-+
-+cdef class Base
-+cdef class EventBase
-+cdef class StateSet
-+cdef class Accessible (Base)
-+cdef class Desktop (Accessible)
-+cdef class Application (Accessible)
-+cdef class Component (Accessible)
-+cdef class Action (Base)
-+cdef class Text (Base)
-+cdef class EditableText (Text)
-+cdef class Hypertext (Text)
-+cdef class Hyperlink (Base)
-+cdef class Image (Base)
-+cdef class Value (Base)
-+cdef class Selection (Base)
-+cdef class Table (Base)
-+cdef class Event (EventBase)
-+cdef class DeviceEvent
-+
-+ctypedef enum bool:
-+	False = 0
-+	True
-+
-+# SPIExceptionCode values:
-+(SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) 
-+
-+# SPIExceptionType values:
-+(SPI_EXCEPTION_SOURCE_UNSPECIFIED, SPI_EXCEPTION_SOURCE_ACCESSIBLE, SPI_EXCEPTION_SOURCE_REGISTRY, SPI_EXCEPTION_SOURCE_DEVICE)=range(4)
-+
-+# Accessible roles
-+(SPI_ROLE_INVALID, SPI_ROLE_ACCEL_LABEL, SPI_ROLE_ALERT, SPI_ROLE_ANIMATION, SPI_ROLE_ARROW, SPI_ROLE_CALENDAR, SPI_ROLE_CANVAS, SPI_ROLE_CHECK_BOX, SPI_ROLE_CHECK_MENU_ITEM, SPI_ROLE_COLOR_CHOOSER, SPI_ROLE_COLUMN_HEADER, SPI_ROLE_COMBO_BOX, SPI_ROLE_DATE_EDITOR, SPI_ROLE_DESKTOP_ICON, SPI_ROLE_DESKTOP_FRAME, SPI_ROLE_DIAL, SPI_ROLE_DIALOG, SPI_ROLE_DIRECTORY_PANE, SPI_ROLE_DRAWING_AREA, SPI_ROLE_FILE_CHOOSER, SPI_ROLE_FILLER, SPI_ROLE_FONT_CHOOSER, SPI_ROLE_FRAME, SPI_ROLE_GLASS_PANE, SPI_ROLE_HTML_CONTAINER, SPI_ROLE_ICON, SPI_ROLE_IMAGE, SPI_ROLE_INTERNAL_FRAME, SPI_ROLE_LABEL, SPI_ROLE_LAYERED_PANE, SPI_ROLE_LIST, SPI_ROLE_LIST_ITEM, SPI_ROLE_MENU, SPI_ROLE_MENU_BAR, SPI_ROLE_MENU_ITEM, SPI_ROLE_OPTION_PANE, SPI_ROLE_PAGE_TAB, SPI_ROLE_PAGE_TAB_LIST, SPI_ROLE_PANEL, SPI_ROLE_PASSWORD_TEXT, SPI_ROLE_POPUP_MENU, SPI_ROLE_PROGRESS_BAR, SPI_ROLE_PUSH_BUTTON, SPI_ROLE_RADIO_BUTTON, SPI_ROLE_RADIO_MENU_ITEM, SPI_ROLE_ROOT_PANE, SPI_ROLE_ROW_HEADER, SPI_ROLE_SCROLL_BAR, SPI_ROLE_SCROLL_PANE, SPI_ROLE_SEPARATOR, SPI_ROLE_SLIDER, SPI_ROLE_SPIN_BUTTON, SPI_ROLE_SPLIT_PANE, SPI_ROLE_STATUS_BAR, SPI_ROLE_TABLE, SPI_ROLE_TABLE_CELL, SPI_ROLE_TABLE_COLUMN_HEADER, SPI_ROLE_TABLE_ROW_HEADER, SPI_ROLE_TEAROFF_MENU_ITEM, SPI_ROLE_TERMINAL, SPI_ROLE_TEXT, SPI_ROLE_TOGGLE_BUTTON, SPI_ROLE_TOOL_BAR, SPI_ROLE_TOOL_TIP, SPI_ROLE_TREE, SPI_ROLE_TREE_TABLE, SPI_ROLE_UNKNOWN, SPI_ROLE_VIEWPORT, SPI_ROLE_WINDOW, SPI_ROLE_EXTENDED, SPI_ROLE_HEADER, SPI_ROLE_FOOTER, SPI_ROLE_PARAGRAPH, SPI_ROLE_RULER, SPI_ROLE_APPLICATION, SPI_ROLE_AUTOCOMPLETE, SPI_ROLE_EDITBAR, SPI_ROLE_EMBEDDED, SPI_ROLE_LAST_DEFINED)=range(79)
-+
-+# Accessible states
-+(SPI_STATE_INVALID, SPI_STATE_ACTIVE, SPI_STATE_ARMED, SPI_STATE_BUSY, SPI_STATE_CHECKED, SPI_STATE_COLLAPSED, SPI_STATE_DEFUNCT, SPI_STATE_EDITABLE, SPI_STATE_ENABLED, SPI_STATE_EXPANDABLE, SPI_STATE_EXPANDED, SPI_STATE_FOCUSABLE, SPI_STATE_FOCUSED, SPI_STATE_HORIZONTAL, SPI_STATE_ICONIFIED, SPI_STATE_MODAL, SPI_STATE_MULTI_LINE, SPI_STATE_MULTISELECTABLE, SPI_STATE_OPAQUE, SPI_STATE_PRESSED, SPI_STATE_RESIZABLE, SPI_STATE_SELECTABLE, SPI_STATE_SELECTED, SPI_STATE_SENSITIVE, SPI_STATE_SHOWING, SPI_STATE_SINGLE_LINE, SPI_STATE_STALE, SPI_STATE_TRANSIENT, SPI_STATE_VERTICAL, SPI_STATE_VISIBLE, SPI_STATE_MANAGES_DESCENDANTS, SPI_STATE_INDETERMINATE) = range(32);
-+
-+# Accessible relation types
-+(SPI_RELATION_NULL, SPI_RELATION_LABEL_FOR, SPI_RELATION_LABELED_BY, SPI_RELATION_CONTROLLER_FOR, SPI_RELATION_CONTROLLED_BY, SPI_RELATION_MEMBER_OF, SPI_RELATION_NODE_CHILD_OF, SPI_RELATION_EXTENDED, SPI_RELATION_FLOWS_TO, SPI_RELATION_FLOWS_FROM, SPI_RELATION_SUBWINDOW_OF, SPI_RELATION_EMBEDS, SPI_RELATION_EMBEDDED_BY, SPI_RELATION_POPUP_FOR, SPI_RELATION_LAST_DEFINED) = range (15);
-+
-+# AccessibleComponent layers
-+(SPI_LAYER_INVALID, SPI_LAYER_BACKGROUND, SPI_LAYER_CANVAS, SPI_LAYER_WIDGET, SPI_LAYER_MDI, SPI_LAYER_POPUP, SPI_LAYER_OVERLAY, SPI_LAYER_WINDOW, SPI_LAYER_LAST_DEFINED) = range(9)
-+
-+#AccessibleKeySynthType
-+(SPI_KEY_PRESS, SPI_KEY_RELEASE, SPI_KEY_PRESSRELEASE, SPI_KEY_SYM, SPI_KEY_STRING) = range(5)
-+
-+# AccessibleKeyListenerSyncType
-+(SPI_KEYLISTENER_NOSYNC, SPI_KEYLISTENER_SYNCHRONOUS, SPI_KEYLISTENER_CANCONSUME, SPI_KEYLISTENER_ALL_WINDOWS) = range(4)
-+
-+# AccessibleDeviceEventType
-+SPI_KEY_PRESSED  = 1<<0
-+SPI_KEY_RELEASED = 1<<1
-+SPI_BUTTON_PRESSED = 1<<2
-+SPI_BUTTON_RELEASED = 1<<3
-+
-+cdef cspi.AccessibleKeySet *SPI_KEYSET_ALL_KEYS
-+SPI_KEYSET_ALL_KEYS = NULL
-+
-+Accessibility_MODIFIER_SHIFT = 1 << 0
-+Accessibility_MODIFIER_SHIFTLOCK = 1 << 1
-+Accessibility_MODIFIER_CONTROL = 1 << 2
-+Accessibility_MODIFIER_ALT = 1 << 3
-+Accessibility_MODIFIER_META = 1 << 4
-+Accessibility_MODIFIER_META2 = 1 << 5
-+Accessibility_MODIFIER_META3 = 1 << 6
-+Accessibility_MODIFIER_NUMLOCK = 1 << 7
-+
-+
-+cdef object string(char * string):
-+	cdef object pyString
-+	pyString = string
-+	cspi.SPI_freeString(string)
-+	return pyString
-+
-+import os
-+class X11Exception(Exception):
-+	def __init__(self, display = os.environ.get('DISPLAY', None)):
-+		self.display = display
-+	def __str__(self):
-+		msg = "Cannot open display"
-+		if self.display: return msg + ': ' + self.display
-+		else: return msg
-+
-+class AtspiException(Exception):
-+	"""
-+	Exceptions raised when calls to the AT-SPI C bindings return FALSE to
-+	indicate failure.
-+	"""
-+	def __init__(self, message):
-+		self.message = message
-+
-+	def __str__(self):
-+		return "AtspiException: %s"%self.message
-+
-+class SpiException(Exception):
-+	"""
-+	Exceptions to be raised in response to an installed
-+	SPIExceptionHandler, corresponding to a SPIException.  These appear to
-+	be short-lived structs, so we gather all applicable data immediately
-+	"""
-+	def __init__(self, is_fatal, sourceType, exceptionCode, description):
-+		# print "got to __init__"
-+		self.fatal = is_fatal
-+		self.sourceType = sourceType
-+		self.exceptionCode = exceptionCode
-+		self.description = description
-+		
-+		# print "leaving __init__"
-+		# print self.fatal
-+		# print self.sourceType
-+		# print self.exceptionCode
-+		# print self.description
-+
-+	def __str__(self):
-+		if self.fatal:
-+			fatalStr = "Fatal"
-+		else:
-+			fatalStr = "Non-fatal"
-+		result = '%s SPIException: type:%s source:%s "%s"'%(fatalStr, self.sourceType, self.exceptionCode, self.description)
-+		return result
-+
-+cdef make_exception(cspi.SPIException *err, cspi.SPIBoolean is_fatal):
-+	# Don't attempt to use SPIAccessibleException_getSource; this is error
-+	# handling code, we don't want to introduce further complications
-+	return SpiException(is_fatal,
-+			    cspi.SPIException_getSourceType (err),
-+			    cspi.SPIException_getExceptionCode (err),
-+			    cspi.SPIException_getDescription (err))
-+
-+	
-+def event_main():
-+	cspi.SPI_event_main()
-+
-+def event_quit():
-+	cspi.SPI_event_quit()
-+
-+cdef cspi.SPIBoolean exception_handler (cspi.SPIException *err, cspi.SPIBoolean is_fatal) except *:
-+	# print "got exception!!!"
-+	e = make_exception(err, is_fatal)
-+	raise e
-+
-+# at-spi-<version>/cpsi.h contains:
-+#   typedef SPIBoolean (*SPIExceptionHandler) (SPIException *err, SPIBoolean is_fatal);
-+# and
-+#   SPIBoolean SPI_exceptionHandlerPush (SPIExceptionHandler *handler);
-+# There's thus an extra unnecessary level of indirection.
-+# We have to jump through the following hoops to get pyrex to deal with this:
-+cdef cspi.SPIExceptionHandler exception_handler_as_type
-+cdef cspi.SPIExceptionHandler* exception_handler_ptr
-+exception_handler_as_type = exception_handler
-+exception_handler_ptr = &exception_handler_as_type
-+
-+global_exception = None
-+
-+cdef class Registry:
-+	def __init__ (self):
-+		cdef Xlib.Display *display
-+		display = Xlib.XOpenDisplay(NULL)
-+		if display == NULL:
-+			raise X11Exception
-+		else:
-+			Xlib.XCloseDisplay(display)
-+
-+		result = cspi.SPI_init ()
-+		#if result!=0:
-+		#	raise AtspiException("SPI_init: exit code %s" % str(result))
-+
-+		result = cspi.SPI_exceptionHandlerPush (exception_handler_ptr)
-+		if not result:
-+			raise AtspiException("Unable to install SPI exception handler")
-+
-+	def __dealloc (self):
-+		result = cspi.SPI_exit ()
-+		if result!=0:
-+			raise AtspiException("SPI_init: exit code %s" % str(result))
-+
-+	def getDesktopCount (self):
-+		return cspi.SPI_getDesktopCount()
-+
-+	def getDesktop (self, index = 0):
-+		cdef Desktop desktop
-+		desktop = Desktop ()
-+		if not desktop.__setItem (cspi.SPI_getDesktop (index)):
-+			return False
-+		return desktop
-+
-+	def getDesktopList (self):
-+		# Using the bonobo.activation bindings, getDesktopList() returns a 
-+		# Python list of Desktop objects. The C bindings seem to do it differently,
-+		# and Pyrex doesn't like that method. So we're re-implementing the function
-+		# using getDesktopCount() and getDesktop() to work around that.
-+		# Yay for Zack!
-+		#
-+		#	-Zack
-+		cdef Desktop desktop
-+		desktops = []
-+		desktop = Desktop ()
-+		for i in xrange (cspi.SPI_getDesktopCount ()):
-+			desktop.__setItem (cspi.SPI_getDesktop (i))
-+			desktops = desktops + [desktop]
-+		return desktops
-+
-+registry = Registry()
-+
-+cdef class Base:
-+	"""
-+	Wrapper around a cspi.Accessible
-+	"""
-+	
-+	cdef cspi.Accessible *__item
-+	
-+	def __new__ (self):
-+		self.__item = NULL
-+	
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.Accessible_unref (self.__item)
-+
-+	cdef bool __setItem (self, cspi.Accessible *obj):
-+		if self.__item != NULL:
-+			cspi.Accessible_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.Accessible_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+	
-+	def __checkSelf (self):
-+		assert self.__item != NULL
-+
-+# WHY OH WHY won't this work? :(
-+# I need to be able to find out of two Accessible classes contain
-+# the same cspi.Accessible objects.
-+#
-+#	def isSameAs (self, base):
-+#		cdef bool foo
-+#		foo = self.__item == base.__item
-+#		return foo
-+
-+cdef class EventBase:
-+	"""
-+	Wrapper around a cspi.AccessibleEvent
-+	"""
-+	cdef cspi.AccessibleEvent *__item
-+
-+	def __new__ (self):
-+		self.__item = NULL
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.AccessibleEvent_unref (self.__item)
-+
-+	cdef bool __setItem (self, cspi.AccessibleEvent *obj):
-+		if self.__item != NULL: 
-+			cspi.AccessibleEvent_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.AccessibleEvent_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+	def __getattr__ (self, attrName):
-+		cdef cspi.Accessible* acc
-+		cdef Accessible result
-+		if attrName == "source":
-+			acc = self.__item.source
-+			if acc!=NULL:
-+				result = Accessible ()
-+				result.__setItem (acc)
-+				return result
-+		elif attrName == "detail1":
-+			detail1 = self.__item.detail1
-+			return detail1
-+		elif attrName == "detail2":
-+			detail1 = self.__item.detail2
-+			return detail1
-+		elif attrName == "type":
-+			return self.__item.type
-+
-+cdef class StateSet:
-+	"""
-+	Wrapper around a cspi.AccessibleStateSet
-+	"""
-+	cdef cspi.AccessibleStateSet *__item
-+
-+	def __new__ (self):
-+		self.__item = NULL
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.AccessibleStateSet_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+	cdef bool __setItem (self, cspi.AccessibleStateSet *obj):
-+		if self.__item != NULL:
-+			cspi.AccessibleStateSet_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.AccessibleStateSet_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+
-+	cdef bool __contains (self, cspi.AccessibleState s):
-+		self.__checkSelf ()
-+		return cspi.AccessibleStateSet_contains (self.__item, s)
-+
-+	def contains (self, state):
-+		self.__checkSelf ()
-+		return self.__contains(state)
-+
-+	cdef void __add (self, cspi.AccessibleState s):
-+		self.__checkSelf ()
-+		cspi.AccessibleStateSet_add(self.__item, s)
-+
-+	def add (self, state):
-+		self.__checkSelf ()
-+		self.__add (state)
-+
-+	cdef void __remove (self, cspi.AccessibleState s):
-+		self.__checkSelf ()
-+		cspi.AccessibleStateSet_remove (self.__item, s)
-+
-+	def remove (self, state):
-+		self.__checkSelf ()
-+		self.__remove (state)
-+		
-+	def __str__ (self):
-+		self.__checkSelf ()
-+		return str(self.states)
-+
-+	def __getattr__(self, name):
-+		if name == "states":
-+			result = []
-+			for state in range(SPI_STATE_INVALID, SPI_STATE_INDETERMINATE):
-+				if self.contains(state):
-+					result.append(state)
-+			return result
-+		else:
-+			raise AttributeError, name
-+
-+cdef class Relation:
-+	"""
-+	Wrapper around a cspi.AccessibleRelation
-+	"""
-+	cdef cspi.AccessibleRelation *__item
-+
-+	def __new__ (self):
-+		self.__item = NULL
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.AccessibleRelation_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+	def __str__ (self):
-+		self.__checkSelf ()
-+		return "relation %s -> %s"%(self.getRelationType (), self.getTargets())
-+
-+	def __repr__ (self):
-+		self.__checkSelf ()
-+		return "relation %s -> %s"%(self.getRelationType (), self.getTargets())
-+
-+	cdef bool __setItem (self, cspi.AccessibleRelation *obj):
-+		if self.__item != NULL:
-+			cspi.AccessibleRelation_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.AccessibleRelation_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+
-+	def getNTargets (self):
-+		"""
-+		Wrapper around cspi.AccessibleRelation_getNTargets
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleRelation_getNTargets (self.__item)
-+
-+	def getTarget (self, i):
-+		"""
-+		Wrapper around cspi.AccessibleRelation_getTarget
-+		"""
-+		self.__checkSelf ()
-+		cdef Accessible target
-+		target = Accessible ()
-+		target.__setItem (cspi.AccessibleRelation_getTarget (self.__item, i))
-+		target.__checkSelf ()
-+		return target
-+
-+	def getTargets (self):
-+		"""
-+		Gets the targets of this AccessibleRelation as a list of atspi.Accessible
-+		"""
-+		self.__checkSelf ()
-+		result = []
-+		count = self.getNTargets()
-+		for i in range(count):
-+			result.append(self.getTarget(i))
-+		return result
-+
-+	def getRelationType (self):
-+		"""
-+		Wrapper around cspi.AccessibleRelation_getRelationType
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleRelation_getRelationType (self.__item)
-+
-+cdef class Accessible (Base):
-+	"""
-+	Wrapper around cspi.Accessible
-+	"""
-+	def __getattr__ (self, name):
-+		if name == "name":
-+			return self.getName ()
-+		elif name == "role":
-+			return self.getRole ()
-+		elif name == "roleName":
-+			return self.getRoleName ()
-+		elif name == "description":
-+			return self.getDescription ()
-+		elif name == "parent":
-+			return self.getParent ()
-+		elif name == "childCount":
-+			return self.getChildCount ()
-+		elif name == "indexInParent":
-+			return self.getIndexInParent ()
-+		elif name == "stateSet":
-+			return self.getStateSet ()
-+		else:
-+			raise AttributeError, name
-+
-+	def getName (self):
-+		"""
-+		Wrapper around cspi.Accessible_getName
-+		"""
-+		self.__checkSelf()
-+		return string(cspi.Accessible_getName(self.__item))
-+
-+	def getDescription (self):
-+		"""
-+		Wrapper around cspi.Accessible_getDescription
-+		"""
-+		self.__checkSelf()
-+		return string(cspi.Accessible_getDescription(self.__item))
-+
-+	def getParent (self):
-+		"""
-+		Wrapper around cspi.Accessible_getParent, returning an
-+		atspi.Accessible or None
-+		"""
-+		self.__checkSelf()
-+		cdef Accessible parent
-+		cdef cspi.Accessible* spiParent
-+		
-+		spiParent = cspi.Accessible_getParent (self.__item)
-+		if spiParent!=NULL:
-+			parent = Accessible ()
-+			parent.__setItem (spiParent)
-+			parent.__checkSelf ()
-+			return parent
-+		else:
-+			return None
-+
-+	def getChildAtIndex (self, index):
-+		"""
-+		Wrapper around cspi.Accessible_getChildAtIndex, returning an
-+		atspi.Accessible, atspi.Application, or None
-+		"""
-+		self.__checkSelf()
-+		cdef int i
-+		i = index
-+		
-+		# This hairiness is due to the fact that Pyrex doesn't allow cdefs 
-+		# inside if blocks.
-+		
-+		cdef cspi.Accessible* spiChild
-+		spiChild = cspi.Accessible_getChildAtIndex (self.__item, i)
-+		# Workaround for GNOME bug #321273
-+		# http://bugzilla.gnome.org/show_bug.cgi?id=321273
-+		if spiChild == NULL: return None
-+		
-+		cdef object child
-+		cdef Application app
-+		cdef Accessible acc
-+		cdef Text text
-+		
-+		if cspi.Accessible_isApplication (spiChild):
-+			app = Application ()
-+			app.__setItem (spiChild)
-+			child = app
-+		else:
-+			acc = Accessible ()
-+			acc.__setItem (spiChild)
-+			child = acc
-+
-+		return child
-+
-+	def getIndexInParent (self):
-+		"""
-+		Wrapper around cspi.Accessible_getIndexInParent
-+		"""
-+		self.__checkSelf()
-+		return cspi.Accessible_getIndexInParent (self.__item)
-+
-+	def getRole (self):
-+		"""
-+		Wrapper around cspi.Accessible_getRole
-+		"""
-+		self.__checkSelf()
-+		return cspi.Accessible_getRole (self.__item)
-+
-+	def getRoleName (self):
-+		"""
-+		Wrapper around cspi.Accessible_getRoleName
-+		"""
-+		self.__checkSelf()
-+		return string(cspi.Accessible_getRoleName (self.__item))
-+
-+	def getChildCount (self):
-+		"""
-+		Wrapper around cspi.Accessible_getChildCount
-+		"""
-+		self.__checkSelf()
-+		return cspi.Accessible_getChildCount (self.__item)
-+
-+	def getStateSet (self):
-+		"""
-+		Wrapper around cspi.Accessible_getStateSet, returning an
-+		atspi.StateSet
-+		"""
-+		self.__checkSelf()
-+		cdef StateSet set
-+		set = StateSet()
-+		set.__setItem (cspi.Accessible_getStateSet (self.__item))
-+		return set
-+
-+	def getInterface (self, interface):
-+		"""
-+		This is NOT part of cspi, it is just for compatibility with
-+		the bonobo bindings and will probably go away soon.
-+		"""
-+		self.__checkSelf()
-+		return getattr(self, "get%s" % interface) ()
-+
-+	def getAction (self):
-+		"""
-+		Wrapper around cspi.Accessible_getAction, returning
-+		an atspi.Action or None
-+		"""
-+		self.__checkSelf()
-+		cdef Action action
-+		action = Action ()
-+		action.__setItem (cspi.Accessible_getAction (self.__item))
-+		if action.__item != NULL:
-+			return action
-+
-+	def getText (self):
-+		"""
-+		Wrapper around cspi.Accessible_getText, returning an atspi.Text
-+		or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Text text
-+		text = Text ()
-+		text.__setItem (cspi.Accessible_getText (self.__item))
-+		if text.__item != NULL:
-+			return text
-+			
-+	def getEditableText (self):
-+		"""
-+		Wrapper around cspi.Accessible_getText, returning an
-+		atspi.EditableText or None
-+		"""
-+		self.__checkSelf ()
-+		cdef EditableText etext
-+		etext = EditableText ()
-+		etext.__setItem (cspi.Accessible_getEditableText (self.__item))
-+		if etext.__item != NULL:
-+			return etext
-+
-+	def getHypertext (self):
-+		"""
-+		Wrapper around cspi.Accessible_getHypertext, returning an
-+		atspi.Hypertext or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Hypertext hypertext
-+		hypertext = Hypertext ()
-+		hypertext.__setItem (cspi.Accessible_getHypertext (self.__item))
-+		if hypertext.__item != NULL:
-+			return hypertext
-+
-+	def getImage (self):
-+		"""
-+		Wrapper around cspi.Accessible_getImage, returning an
-+		atspi.Image or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Image image
-+		image = Image ()
-+		image.__setItem (cspi.Accessible_getImage (self.__item))
-+		if image.__item != NULL:
-+			return image
-+
-+	def getValue (self):
-+		"""
-+		Wrapper around cspi.Accessible_getValue, returning an
-+		atspi.Value or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Value value
-+		value = Value ()
-+		value.__setItem (cspi.Accessible_getValue (self.__item))
-+		if value.__item != NULL:
-+			return value
-+
-+	def getSelection (self):
-+		"""
-+		Wrapper around cspi.Accessible_getSelection, returning an
-+		atspi.Selection or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Selection selection
-+		selection = Selection ()
-+		selection.__setItem (cspi.Accessible_getSelection (self.__item))
-+		if selection.__item != NULL:
-+			return selection 
-+
-+	def getComponent (self):
-+		"""
-+		Wrapper around cspi.Accessible_getComponent, returning an
-+		atspi.Component or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Component component
-+		component = Component ()
-+		component.__setItem (cspi.Accessible_getComponent (self.__item))
-+		if component.__item != NULL:
-+			return component
-+
-+	def getRelationSet (self):
-+		"""
-+		Wraps Accessible_getRelationSet, returning a list
-+		of atspi.Relation
-+		"""
-+		# looking at at-poke, result from C API appears to be a NULL-terminated list of pointers, and that we should free the buffer
-+		self.__checkSelf ()
-+		cdef Relation relation
-+
-+		relations = []
-+		cdef cspi.AccessibleRelation **relationSet
-+		relationSet = cspi.Accessible_getRelationSet (self.__item)
-+
-+		i=0
-+		while relationSet[i]:
-+			relation = Relation ()
-+			relation.__setItem (relationSet[i])
-+			relations.append(relation)
-+			i=i+1
-+		cspi.free (relationSet)
-+
-+		return relations
-+
-+
-+cdef class Desktop (Accessible):
-+	pass
-+
-+
-+cdef class Application (Accessible):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleApplication_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getToolkit (self):
-+		"""
-+		Wraps AccessibleApplication_getToolkitName, returning a string
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_getToolkitName (self.__item)
-+
-+	def getVersion (self):
-+		"""
-+		Wraps AccessibleApplication_getVersion, returning a string
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_getVersion(self.__item)
-+
-+	def getID (self):
-+		"""
-+		Wraps AccessibleApplication_getID, returning a string
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_getID (self.__item)
-+
-+	def pause (self):
-+		"""
-+		Wraps AccessibleApplication_pause
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_pause (self.__item)
-+
-+	def resume (self):
-+		"""
-+		Wraps AccessibleApplication_resume
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_resume (self.__item)
-+
-+cdef class Component (Accessible):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleComponent_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getExtents (self, type=0):
-+		"""
-+		Wraps cspi.AccessibleComponent_getExtents, returning an
-+		(x,y,w,h) tuple.
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y, w, h
-+		cspi.AccessibleComponent_getExtents (self.__item, &x, &y, &w, &h, type)
-+		return (x, y, w, h)
-+
-+	def getPosition (self, type = 0):
-+		"""
-+		Wraps cspi.AccessibleComponent_getPosition, returning an
-+		(x,y) tuple.
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y
-+		cspi.AccessibleComponent_getPosition (self.__item, &x, &y, type)
-+		return (x, y)
-+
-+	def getSize (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_getSize, returning a
-+		(w,h) tuple.
-+		"""
-+		self.__checkSelf ()
-+		cdef long w, h
-+		cspi.AccessibleComponent_getSize (self.__item, &w, &h)
-+		return (w, h)
-+
-+	def getLayer (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_getLayer, returning an 
-+		AccessibleComponentLayer.
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleComponent_getLayer (self.__item)
-+
-+	def grabFocus (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_grabFocus, raising AtspiException
-+		if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleComponent_grabFocus (self.__item):
-+			raise AtspiException("AccessibleComponent_grabFocus")
-+	
-+	def getMDIZOrder (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_getMDIZOrder, returning an integer.
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleComponent_getMDIZOrder(self.__item)
-+
-+cdef class Action (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleAction_ functions,
-+	giving an OO-style API.
-+	"""
-+	def __getattr__ (self, name):
-+		if name == "nActions":
-+			return self.getNActions ()
-+		else:
-+			raise AttributeError, name
-+
-+	def getNActions (self):
-+		"""
-+		Wraps cspi.AccessibleAction_getNActions
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleAction_getNActions (self.__item)
-+
-+	def doAction (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_doAction
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleAction_doAction (self.__item, index)
-+
-+	def getKeyBinding (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_getKeyBinding
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleAction_getKeyBinding (self.__item, index)
-+
-+	def getName (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_getName
-+		"""
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleAction_getName (self.__item, index))
-+
-+	def getDescription (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_getDescription
-+		"""
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleAction_getDescription (self.__item, index))
-+
-+
-+cdef class Text (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleText_ functions,
-+	giving an OO-style API.
-+	"""
-+	def addSelection (self, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleText_addSelection
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_addSelection (self.__item, startOffset, endOffset):
-+			raise AtspiException("AccessibleText_addSelection")
-+			
-+
-+	#def getAttributes (self, offset, startOffset, endOffset):
-+	#	self.__checkSelf ()
-+	#	return cspi.AccessibleText_getAttributes (self.__item, offset, startOffset, endOffset)
-+	def getCaretOffset (self):
-+		"""
-+		Wraps cspi.AccessibleText_getCaretOffset
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleText_getCaretOffset (self.__item)
-+
-+	def getCharacterCount (self):
-+		"""
-+		Wraps cspi.AccessibleText_getCharacterCount
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleText_getCharacterCount (self.__item)
-+
-+	def getNSelections (self):
-+		"""
-+		Wraps cspi.AccessibleText_getNSelections
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleText_getNSelections (self.__item)
-+
-+	#def getSelection (self, selectionNum, startOffset, endOffset):
-+	#	self.__checkSelf ()
-+	#	return cspi.AccessibleText_getSelection (self.__item, selectionNum, startOffset, endOffset)
-+
-+	def getText (self, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleText_getText
-+		"""
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleText_getText (self.__item, startOffset, endOffset))
-+
-+	def removeSelection (self, selectionNum):
-+		"""
-+		Wraps cspi.AccessibleText_removeSelection, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_removeSelection (self.__item, selectionNum):
-+			raise AtspiException("AccessibleText_removeSelection")
-+
-+	def setSelection (self, selectionNum, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleText_setSelection, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_setSelection (self.__item, selectionNum, startOffset, endOffset):
-+			raise AtspiException("AccessibleText_setSelection")
-+
-+	def setCaretOffset (self, position):
-+		"""
-+		Wraps cspi.AccessibleText_setCaretOffset, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_setCaretOffset (self.__item, position):
-+			raise AtspiException("AccessibleText_setCaretOffset")
-+
-+cdef class EditableText (Text):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleEditableText_ functions,
-+	giving an OO-style API.
-+	"""
-+	def setTextContents (self, newContents):
-+		"""
-+		Wraps cspi.AccessibleEditableText_setTextContents, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleEditableText_setTextContents (self.__item, newContents):
-+			raise AtspiException("AccessibleEditableText_setTextContents")
-+
-+	def setAttributes (self, attributes, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleEditableText_setAttributes, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleEditableText_setAttributes (self.__item, attributes, startOffset, endOffset):
-+			raise AtspiException("AccessibleEditableText_setAttributes")
-+
-+	def insertText (self, position, text):
-+		"""
-+		Wraps cspi.AccessibleEditableText_insertText, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleEditableText_insertText (self.__item, position, text, cspi.strlen(text)):
-+			raise AtspiException("AccessibleEditableText_insertText")
-+
-+cdef class Hypertext (Text):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleHypertext_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getNLinks (self):
-+		"""
-+		Wraps cspi.AccessibleHypertext_getNLinks, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHypertext_getNLinks (self.__item)
-+
-+	def getLink (self, linkIndex):
-+		"""
-+		Wraps cspi.AccessibleHypertext_getLink, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		cdef Hyperlink hyperlink
-+		hyperlink = Hyperlink ()
-+		hyperlink.__setItem (cspi.AccessibleHypertext_getLink (self.__item, linkIndex))
-+		if hyperlink.__item != NULL:
-+			return hyperlink
-+
-+	def getLinkIndex (self, characterOffset):
-+		"""
-+		Wraps cspi.AccessibleHypertext_getLinkIndex, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHypertext_getLinkIndex (self.__item, characterOffset)
-+
-+cdef class Hyperlink (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleHyperlink_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getNAnchors (self):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getNAnchors, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHyperlink_getNAnchors (self.__item)
-+
-+	def getIndexRange (self):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getIndexRange, returning [startIndex, endIndex] pair
-+		"""
-+		self.__checkSelf ()
-+		cdef long startIndex, endIndex
-+		cspi.AccessibleHyperlink_getIndexRange(self.__item, &startIndex, &endIndex)
-+		return [startIndex, endIndex]
-+
-+
-+	def getObject (self, i):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getObject
-+		"""
-+		self.__checkSelf ()
-+		cdef Accessible object
-+		object = Accessible ()
-+		object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i))
-+		object.__checkSelf ()
-+		return object
-+
-+	def getURI (self, i):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getURI, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHyperlink_getURI (self.__item, i)
-+
-+	def isValid (self):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_isValid, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHyperlink_isValid (self.__item)
-+
-+cdef class Image (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleImage_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getImageDescription (self):
-+		"""
-+		Wraps cspi.AccessibleImage_getImageDescription
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleImage_getImageDescription (self.__item)
-+
-+	def getImageSize (self):
-+		"""
-+		Wraps cspi.AccessibleImage_getImageSize, returning a (w,h) pair
-+		"""
-+		self.__checkSelf ()
-+		cdef long w, h
-+		cspi.AccessibleImage_getImageSize(self.__item, &w, &h);
-+		return [w, h]
-+
-+	def getImagePosition (self, type=0):
-+		"""
-+		Wraps cspi.AccessibleImage_getImagePosition, returning a (x,y)
-+		pair
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y
-+		cspi.AccessibleImage_getImagePosition(self.__item, &x, &y, type)
-+		return [x, y]
-+
-+	def getImageExtents (self, type=0):
-+		"""
-+		Wraps cspi.AccessibleImage_getImageExtents, returning a
-+		(x,y,w,h) tuple
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y, w, h
-+		cspi.AccessibleImage_getImageExtents(self.__item, &x, &y, &w, &h, type)
-+		return [x, y, w, h]
-+
-+cdef class Value (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleValue_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getMinimumValue (self):
-+		"""
-+		Wraps cspi.AccessibleValue_getMinimumValue
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleValue_getMinimumValue(self.__item)
-+
-+	def getCurrentValue (self):
-+		"""
-+		Wraps cspi.AccessibleValue_getMinimumValue
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleValue_getCurrentValue(self.__item)
-+
-+	def getMaximumValue (self):
-+		"""
-+		Wraps cspi.AccessibleValue_getMinimumValue
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleValue_getMaximumValue(self.__item)
-+
-+	def setCurrentValue (self, newValue):
-+		"""
-+		Wraps cspi.AccessibleValue_setCurrentValue
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleValue_setCurrentValue (self.__item, newValue):
-+			raise AtspiException("AccessibleValue_setCurrentValue")
-+
-+cdef class Selection (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleSelection_ functions,
-+	giving an OO-style API.
-+	"""
-+
-+	def getNSelectedChildren (self):
-+		"""
-+		Wraps cspi.AccessibleSelection_getNSelectedChildren
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_getNSelectedChildren (self.__item)
-+
-+	def getSelectedChild (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_getSelectedChild
-+		"""
-+		self.__checkSelf ()
-+
-+		cdef cspi.Accessible* spiChild
-+		spiChild = cspi.AccessibleSelection_getSelectedChild (self.__item, index)
-+
-+		assert spiChild != NULL
-+		
-+		cdef object child
-+		cdef Application app
-+		cdef Accessible acc
-+		cdef Text text
-+		
-+		if cspi.Accessible_isApplication (spiChild):
-+			app = Application ()
-+			app.__setItem (spiChild)
-+			child = app
-+		else:
-+			acc = Accessible ()
-+			acc.__setItem (spiChild)
-+			child = acc
-+
-+		return child
-+
-+	def selectChild (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_selectChild
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_selectChild (self.__item, index)
-+	
-+	def deselectSelectedChild (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_deselectSelectedChild
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_deselectSelectedChild (self.__item, index)
-+	
-+	def isChildSelected (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_isChildSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_isChildSelected (self.__item, index)
-+
-+	def selectAll (self):
-+		"""
-+		Wraps cspi.AccessibleSelection_selectAll
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_selectAll( self.__item)
-+
-+	def clearSelection (self):
-+		"""
-+		Wraps cspi.AccessibleSelection_clearSelection
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_clearSelection (self.__item)
-+	
-+cdef class Table (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleTable_ functions,
-+	giving an OO-style API.
-+	"""
-+
-+	# def getTableAccessibleAt (self, row, column):
-+	# def getTableCaption (self):
-+
-+	def getTableColumnAtIndex (self, index):
-+		"""
-+		Wraps cspi.AccessibleTable_getColumnAtIndex
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getColumnAtIndex(self.__item, index)
-+					
-+	def getTableColumnDescription (self, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getColumnDescription
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getColumnDescription(self.__item, column)
-+
-+	def getTableColumnExtentAt (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getColumnExtentAt
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getColumnExtentAt(self.__item, row, column)
-+
-+	# def getTableColumnHeader (self, column):
-+
-+	def getTableIndexAt (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getIndexAt
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getIndexAt(self.__item, row, column)
-+
-+	def getTableNColumns (self):
-+		"""
-+		Wraps cspi.AccessibleTable_getNColumns
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNColumns(self.__item)
-+
-+	def getTableNRows (self):
-+		"""
-+		Wraps cspi.AccessibleTable_getNRows
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNRows(self.__item)
-+
-+	def getTableNSelectedColumns (self):
-+		"""
-+		Wraps cspi.AccessibleTable_getNSelectedColumns
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNSelectedColumns(self.__item)
-+
-+	def getTableNSelectedRows (self):
-+		"""
-+x		Wraps cspi.AccessibleTable_getNSelectedRows
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNSelectedRows(self.__item)
-+
-+	def getTableRowAtIndex (self, index):
-+		"""
-+		Wraps cspi.AccessibleTable_getRowAtIndex
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getRowAtIndex(self.__item, index)
-+
-+	def getTableRowDescription (self, row):
-+		"""
-+		Wraps cspi.AccessibleTable_getRowDescription
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getRowDescription(self.__item, row)
-+
-+	def getTableRowExtentAt (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getRowExtentAt
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getRowExtentAt(self.__item, row, column)
-+
-+	# def getTableRowHeader (self, row):
-+ 	# def getTableSelectedRows (self, **selectedRows): - Not sure if the variable which is a pointer to a pointer is acceptable
-+	# def getTableSelectedColumns (self, **selectedColumns): - Same issue as above
-+	# def getTableSummary (self):
-+
-+	def isTableColumnSelected (self, column):
-+		"""
-+		Wraps cspi.AccessibleTable_isColumnSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_isColumnSelected(self.__item, column)
-+
-+	def isTableRowSelected (self, row):
-+		"""
-+		Wraps cspi.AccessibleTable_isRowSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_isRowSelected(self.__item, row)
-+
-+	def isTableSelected (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_isSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_isSelected(self.__item, row, column)
-+
-+
-+cdef class Event (EventBase):
-+	#def AccessibleEventListener* SPI_createAccessibleEventListener (AccessibleEventListenerCB callback, void *user_data)
-+	#void AccessibleEventListener_unref (AccessibleEventListener *listener)
-+	#SPIBoolean AccessibleEventListener_addCallback (AccessibleEventListener *listener, AccessibleEventListenerCB callback, void *user_data)
-+	#SPIBoolean AccessibleEventListener_removeCallback (AccessibleEventListener *listener, AccessibleEventListenerCB callback)
-+
-+	#Accessible* AccessibleActiveDescendantChangedEvent_getActiveDescendant (AccessibleEvent *event)
-+	#Accessible* AccessibleChildChangedEvent_getChildAccessible (AccessibleEvent *event)
-+	
-+	def getDescriptionChangedEventDescriptionString (self):
-+		self.__checkSelf()
-+		return string(cspi.AccessibleDescriptionChangedEvent_getDescriptionString(self.__item))
-+
-+	def getNameChangedEventNameString (self):
-+		self.__checkSelf()
-+		return string(cspi.AccessibleNameChangedEvent_getNameString(self.__item))
-+
-+	# Accessible* AccessibleParentChangedEvent_getParentAccessible (AccessibleEvent *event)
-+
-+	def getTableCaptionChangedEventCaptionString(self):
-+		self.__checkSelf()
-+		return string(cspi.AccessibleTableCaptionChangedEvent_getCaptionString(self.__item))
-+
-+	def getTableColumnDescriptionChangedEventDescriptionString(self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTableColumnDescriptionChangedEvent_getDescriptionString(self.__item))
-+
-+	# Accessible* AccessibleTableHeaderChangedEvent_getHeaderAccessible (AccessibleEvent *event)
-+
-+	def getTableRowDescriptionChangedEventDescriptionString(self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTableRowDescriptionChangedEvent_getDescriptionString(self.__item))
-+	
-+	#Accessible* AccessibleTableSummaryChangedEvent_getSummaryAccessible (AccessibleEvent *event)
-+
-+	def getTextChangedEventChangeString (self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTextChangedEvent_getChangeString(self.__item))
-+
-+	def getTextSelectionChangedEventSelectionString (self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTextSelectionChangedEvent_getSelectionString(self.__item))
-+
-+	def getWindowEventTitleString (self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleWindowEvent_getTitleString(self.__item))
-+
-+class EventGenerator:
-+	"""
-+	Wrapper layer around SPI_generateKeyboardEvent and
-+	SPI_generateMouseEvent, used for generating input events.
-+
-+	Use AccessibleAction in preference to this.
-+	"""
-+	def injectKeyboardString (self, string):
-+		"""
-+		Inject a string as if it had been typed using an input method.
-+		"""
-+		# Seems to only work if you do it one character at a time...
-+		for char in string:
-+			self.__generateKeystringEvent (str(char), cspi.SPI_KEY_STRING)
-+
-+	def __keyStringToKeyCode(self, keyString):
-+		cdef Xlib.Display *display
-+		display = Xlib.XOpenDisplay(NULL)
-+
-+		cdef Xlib.KeySym sym
-+		sym = Xlib.XStringToKeysym(keyString)
-+		cdef Xlib.KeyCode code
-+		code = Xlib.XKeysymToKeycode(display, sym)
-+
-+		#print str(keyString), str(int(sym)), code
-+
-+		Xlib.XCloseDisplay(display)
-+		return int(code)
-+	
-+	def generateKeyCombo (self, keyStrings):
-+		modifiers = keyStrings[:-1]
-+		finalKey = keyStrings[-1]
-+
-+		for modifier in modifiers:
-+			code = self.__keyStringToKeyCode(modifier)
-+			self.generateKeyboardEvent(code, '', cspi.SPI_KEY_PRESS)
-+
-+		code = self.__keyStringToKeyCode(finalKey)
-+		self.generateKeyboardEvent(code, '', cspi.SPI_KEY_PRESSRELEASE)
-+
-+		for modifier in modifiers:
-+			code = self.__keyStringToKeyCode(modifier)
-+			self.generateKeyboardEvent(code, '', cspi.SPI_KEY_RELEASE)
-+
-+		
-+	def __generateKeyvalEvent (self, keyval, synthType):
-+		self.generateKeyboardEvent (keyval, None, synthType)
-+
-+	def __generateKeystringEvent (self, keystring, synthType):
-+		self.generateKeyboardEvent (0, keystring, synthType)
-+	
-+	def generateKeyboardEvent (self, keyval, keystring, synthType):
-+		if not cspi.SPI_generateKeyboardEvent (keyval, keystring, synthType):
-+			raise AtspiException("SPI_generateKeyboardEvent")
-+
-+	def click (self, x, y, button):
-+		"""
-+		Synthesize a mouse button click at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "c")
-+
-+	def doubleClick (self, x, y, button):
-+		"""
-+		Synthesize a mouse button double-click at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "d")
-+
-+	def press (self, x, y, button):
-+		"""
-+		Synthesize a mouse button press at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "p")
-+
-+	def release (self, x, y, button):
-+		"""
-+		Synthesize a mouse button release at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "r")
-+
-+	def absoluteMotion (self, x, y):
-+		"""
-+		Synthesize mouse absolute motion to (x,y)
-+		"""
-+		self.__generateEvent (x, y, "abs")
-+
-+	def relativeMotion (self, x, y):
-+		"""
-+		Synthesize mouse relative motion of (x,y)
-+		"""
-+		self.__generateEvent (x, y, "rel")
-+
-+	def drag (self, fromXY, toXY, button):
-+		"""
-+		Synthesize a drag (press, move and release) from (x,y) to (x,y).
-+
-+		These are absolute screen coordinates
-+		"""
-+		(x,y) = fromXY
-+		self.press (x, y, button)
-+
-+		(x,y) = toXY
-+		self.absoluteMotion(x,y)
-+
-+		self.release (x, y, button)
-+
-+	def __generateEvent (self, x, y, name):
-+		"""
-+		Thin wrapper around SPI_generateMouseEvent.
-+
-+		Event names: b1p = button 1 press; b2r = button 2 release;
-+		b3c = button 3 click; b2d = button 2 double-click;
-+		abs = absolute motion; rel = relative motion.
-+		"""
-+		if not cspi.SPI_generateMouseEvent (x, y, name):
-+			raise AtspiException("Error generating mouse event")
-+
-+	def __generateButtonEvent (self, x, y, button, suffix):
-+		self.__generateEvent (x, y, self.__generateButtonName(button)+suffix)
-+
-+	def __generateButtonName(self, button):
-+		if button==1:
-+			return "b1"
-+		elif button==2:
-+			return "b2"
-+		elif button==3:
-+			return "b3"
-+		else: raise ValueError, "Unknown button"
-+
-+# We use this C function to marshal a call to a python function.  The Python callback
-+# function is installed as the userdata of this C callback function.  See the
-+# "cheesefinder" demo in the Pyrex sources.
-+# We ignore the "const"ness of the AccessibleEvent
-+cdef void marshalAccessibleEventCallback (cspi.AccessibleEvent *event, void *python_fn) except *:
-+	e = Event()
-+	EventBase.__setItem(e, event)
-+	(<object>python_fn) (e)
-+
-+cdef class EventListener:
-+	"""
-+	Wrapper around the low-level cspi.AccessibleEventListener_ functions,
-+	giving an OO-style API.
-+	"""
-+	cdef cspi.AccessibleEventListener *__item
-+	cdef public object eventTypes
-+
-+	def __init__ (self, callback, eventTypes):
-+		"""
-+		Registers a python callback function to be called.
-+		The callback is expected to have one input, of type atspi.Event, and no return value.
-+		See documentation of SPI_registerGlobalEventListener for the event names
-+		"""
-+		self.eventTypes = eventTypes
-+		self.__item = cspi.SPI_createAccessibleEventListener (marshalAccessibleEventCallback, <void*>callback)
-+		for eventType in self.eventTypes:
-+			#char *e
-+			e = eventType
-+			if not cspi.SPI_registerGlobalEventListener (self.__item, e):
-+				raise AtspiException("Unable to register event listener")
-+
-+	def deregister(self):
-+		for eventType in self.eventTypes:
-+			cspi.SPI_deregisterGlobalEventListener(self.__item, eventType)
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			self.deregister()
-+			cspi.AccessibleEventListener_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+cdef class DeviceEvent:
-+	"""
-+	Wrapper around a cspi.AccessibleDeviceEvent
-+	"""
-+	cdef cspi.AccessibleDeviceEvent *__item
-+	cdef public object keyID
-+	cdef public object keyCode
-+	cdef public object keyString
-+	cdef public object timeStamp
-+	cdef public object type
-+	cdef public object modifiers
-+	cdef public object isText
-+
-+	def __new__ (self):
-+			self.__item = NULL
-+
-+	cdef bool __setItem (self, cspi.AccessibleDeviceEvent *obj):
-+			if obj != NULL:
-+					self.__item = obj
-+					self.keyID = self.__item.keyID
-+					self.keyCode = self.__item.keycode
-+					self.keyString = self.__item.keystring
-+					self.timeStamp = self.__item.timestamp
-+					self.type = self.__item.type
-+					self.modifiers = self.__item.modifiers
-+					if self.__item.is_text: self.isText = True
-+					else: self.isText = False
-+					return True
-+			else:
-+					return False
-+
-+	def __checkSelf (self):
-+			if self.__item == NULL:
-+					raise AttributeError, "__item must not be NULL"
-+
-+#	def __dealloc__ (self):
-+#			if self.__item != NULL:
-+#					cspi.AccessibleDeviceEvent_unref (self.__item)
-+
-+
-+cdef cspi.SPIBoolean marshalAccessibleDeviceEventCallback (cspi.AccessibleDeviceEvent *event, void *python_fn) except 1:
-+	k = DeviceEvent()
-+	#k.__setItem(event)
-+	DeviceEvent.__setItem(k, event)
-+	k.__checkSelf()
-+	(<object>python_fn) (k)
-+	return False
-+
-+cdef class DeviceListener:
-+	"""
-+	Wrapper around the low-level cspi.AccessibleDeviceListener_ functions,
-+	giving an OO-style API.
-+	"""
-+	cdef cspi.AccessibleDeviceListener *__item
-+	cdef public object modMasks
-+
-+	def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED):
-+		"""
-+		Registers a python callback function to be called.
-+
-+		eventMask may be one of the following:
-+        key pressed: 1
-+		key released: 2
-+		key pressed or released (default): 3
-+		"""
-+		self.__item = cspi.SPI_createAccessibleDeviceListener (marshalAccessibleDeviceEventCallback, <void*>callback)
-+		cdef cspi.AccessibleKeySet *keySet
-+		keySet = SPI_KEYSET_ALL_KEYS
-+		self.modMasks = []
-+		cdef short int modMask
-+		syncType = SPI_KEYLISTENER_SYNCHRONOUS | SPI_KEYLISTENER_CANCONSUME
-+		#syncType = SPI_KEYLISTENER_NOSYNC
-+		for modMask from 0 <= modMask < (1 << 8):
-+			self.modMasks.append(modMask)
-+			desc = "keySet "+str(<int> keySet)+" modMask "+str(modMask)+" eventMask "+str(eventMask)+" syncType "+str(syncType)
-+			desc = str(desc)
-+			if not cspi.SPI_registerAccessibleKeystrokeListener (self.__item, keySet, modMask, eventMask, syncType):
-+				raise AtspiException("Unable to register keystroke listener", desc)
-+
-+	def deregister(self):
-+		if self.__item != NULL:
-+			for modMask in self.modMasks:
-+				cspi.SPI_deregisterAccessibleKeystrokeListener(self.__item, modMask)
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			self.deregister()
-+			cspi.AccessibleDeviceListener_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+
-+# vim: sw=4 ts=4 sts=4 noet ai
diff --git a/staging/python-pysqlite/PKGBUILD b/staging/python-pysqlite/PKGBUILD
deleted file mode 100644
index f5985ebca..000000000
--- a/staging/python-pysqlite/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 168723 2012-10-14 21:14:34Z eric $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgbase=python-pysqlite
-pkgname=python2-pysqlite
-pkgver=2.6.3
-pkgrel=3
-pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine"
-license=('custom')
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/pysqlite/"
-depends=('python2' 'sqlite')
-conflicts=('python-pysqlite<=2.6.3-2')
-replaces=('python-pysqlite<=2.6.3-2')
-source=(http://pysqlite.googlecode.com/files/pysqlite-${pkgver}.tar.gz \
-        setup.cfg)
-md5sums=('711afa1062a1d2c4a67acdf02a33d86e'
-         '86dd356c65afd14a22f2f8f64a26441e')
-
-check() {
-    cd "${srcdir}"/pysqlite-${pkgver}/build/lib.*/
-    python2 -c "from pysqlite2 import test; test.test()"
-}
-
-build() {
-	cd "${srcdir}/pysqlite-${pkgver}"
-	cp "${srcdir}/setup.cfg" .
-	python2 setup.py build
-}
-
-package_python2-pysqlite() {
-	cd "${srcdir}/pysqlite-${pkgver}"
-	python2 setup.py install --root="${pkgdir}"
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	rm -r "${pkgdir}/usr/pysqlite2-doc"
-}
diff --git a/staging/python-pysqlite/setup.cfg b/staging/python-pysqlite/setup.cfg
deleted file mode 100644
index ba6c77075..000000000
--- a/staging/python-pysqlite/setup.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[build_ext]
-define=
-include_dirs=/usr/include
-library_dirs=/usr/lib
-libraries=sqlite3
diff --git a/staging/python-urwid/PKGBUILD b/staging/python-urwid/PKGBUILD
deleted file mode 100644
index d1804969c..000000000
--- a/staging/python-urwid/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD,v 1.10 2009/03/13 21:14:09 sergej Exp $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
-# Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
-
-pkgname=('python-urwid' 'python2-urwid')
-pkgver=1.0.2
-pkgrel=2
-pkgdesc="Urwid is a curses-based user interface library."
-license=('LGPL')
-arch=('i686' 'x86_64')
-makedepends=('python2-distribute' 'python-distribute')
-url="http://excess.org/urwid/"
-source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
-md5sums=('00542bbd15fae7ea60b02a7570edee2b')
-
-build() {
-  cp -r urwid-$pkgver python2-urwid-$pkgver
-
-  cd "$srcdir/urwid-$pkgver"
-  python setup.py build
-
-  cd "$srcdir/python2-urwid-$pkgver"
-  sed -i 's#bin/python#bin/python2#' urwid/*.py
-  
-  python2 setup.py build
-}
-
-package_python-urwid() {
-  depends=('python')
-
-  cd "$srcdir/urwid-$pkgver"
-  python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-}
-
-package_python2-urwid() {
-  depends=('python2')
- 
-  cd "$srcdir/python2-urwid-$pkgver"
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-}
-
diff --git a/staging/python-wpactrl/PKGBUILD b/staging/python-wpactrl/PKGBUILD
deleted file mode 100644
index 692b3e8c3..000000000
--- a/staging/python-wpactrl/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 168717 2012-10-14 20:27:32Z eric $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgbase=python-wpactrl
-pkgname=python2-wpactrl
-pkgver=20090609
-pkgrel=4
-pkgdesc="A Python extension for wpa_supplicant/hostapd control interface access"
-arch=('i686' 'x86_64')
-url="http://projects.otaku42.de/wiki/PythonWpaCtrl"
-license=('GPL2')
-depends=('python2')
-conflicts=('python-wpactrl<=20090609-3')
-replaces=('python-wpactrl<=20090609-3')
-source=(ftp://ftp.archlinux.org/other/${pkgbase}/python-wpactrl-20090609.tar.gz)
-md5sums=('8d45739aa9bfa1110a4570bb5ceda768')
-
-build() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-	python2 setup.py build
-}
-
-package_python2-wpactrl() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-	python2 setup.py install --root="${pkgdir}"
-}
diff --git a/staging/qscintilla/PKGBUILD b/staging/qscintilla/PKGBUILD
deleted file mode 100644
index acb9eadfd..000000000
--- a/staging/qscintilla/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 167919 2012-10-03 20:22:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
-pkgbase=qscintilla
-pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
-         'python-qscintilla-common')
-pkgver=2.6.2
-pkgrel=3
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-makedepends=('python2-pyqt' 'pyqt' 'chrpath')
-source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
-        'configure.py-objdir-support.diff')
-md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9'
-         '8cf9c06252e2f11ab00e62848e322fd3')
-
-build() {
-    cd "${srcdir}/QScintilla-gpl-${pkgver}" 
-    patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
-
-    cd Qt4Qt5
-    qmake qscintilla.pro
-    make
-    
-    cd ../designer-Qt4
-    qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
-    make
-
-    cd ../
-    cp -rf Python Python2
-    cd Python
-    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
-    make
-
-    cd ../Python2
-    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
-    make    
-}
-
-package_qscintilla() {
-    pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
-    depends=('qt')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
-package_python-qscintilla-common() {
-    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla"
-    depends=('qscintilla')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-      
-    # Provided by python-qscintilla
-    rm "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
-}
-
-package_python-qscintilla() {
-    pkgdesc="Python 3.x bindings for QScintilla2"
-    depends=('python-qscintilla-common' 'pyqt')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
-    install -Dm755 Qsci.so \
-      "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
-}
-
-package_python2-qscintilla() {
-    pkgdesc="Python 2.x bindings for QScintilla2"
-    depends=('python-qscintilla-common' 'python2-pyqt')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
-    install -Dm755 Qsci.so \
-      "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so"
-}
diff --git a/staging/qscintilla/configure.py-objdir-support.diff b/staging/qscintilla/configure.py-objdir-support.diff
deleted file mode 100644
index b595de18c..000000000
--- a/staging/qscintilla/configure.py-objdir-support.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_configure.dpatch by Torsten Marek <shlomme@debian.org>
-##
-## DP: patch the configure script for the Python bindings to support object dir builds
-
-@DPATCH@
-Index: qscintilla2-2.4.2/Python/configure.py
-===================================================================
---- qscintilla2-2.4.2.orig/Python/configure.py	2010-01-20 20:56:09.000000000 +0100
-+++ qscintilla2-2.4.2/Python/configure.py	2010-01-27 22:54:35.603870417 +0100
-@@ -33,6 +33,7 @@
- import glob
- import optparse
- 
-+src_dir = os.path.dirname(os.path.abspath(__file__))
- 
- # Import SIP's configuration module so that we have access to the error
- # reporting.  Then try and import the configuration modules for both PyQt3 and
-@@ -162,7 +163,7 @@
-     if os.access(sciglobal, os.F_OK):
-         # Get the QScintilla version string.
-         _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
--
-+        return # Debian: do not check for the installed version, we're good this way.
-         if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")):
-             # Because we include the Python bindings with the C++ code we can
-             # reasonably force the same version to be used and not bother about
-@@ -232,9 +233,9 @@
-     argv.append(buildfile)
- 
-     if pyqt.pyqt_version >= 0x040000:
--        argv.append("sip/qscimod4.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod4.sip"))
-     else:
--        argv.append("sip/qscimod3.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod3.sip"))
- 
-     os.system(" ".join(argv))
- 
diff --git a/staging/slim/PKGBUILD b/staging/slim/PKGBUILD
deleted file mode 100644
index a4580b756..000000000
--- a/staging/slim/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 168702 2012-10-14 15:17:29Z tomegun $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Thayer Williams <thayer@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Hugo Ideler <hugoideler@dse.nl>
-
-pkgname=slim
-pkgver=1.3.4
-pkgrel=4
-pkgdesc='Desktop-independent graphical login manager for X11'
-arch=('i686' 'x86_64')
-url='http://slim.berlios.de/'
-license=('GPL2')
-depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
-makedepends=('cmake' 'freeglut')
-backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'rc.d'
-        'pam.d'
-        'logrotate'
-        'slim.service'
-        'session-name.patch'
-        'libpng-1.4+-support.patch'
-        'fix-glibc-segfault-1.3.4.patch')
-
-build() {
-        cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../session-name.patch # FS#26693: fix default session name
-        patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build
-        patch -Np0 -i ../fix-glibc-segfault-1.3.4.patch # FS#30864
-        cd ${srcdir}
-        mkdir build
-        cd build
-        cmake ../${pkgbase}-${pkgver} \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_SKIP_RPATH=ON \
-                -DCMAKE_INSTALL_PREFIX=/usr \
-                -DUSE_PAM=yes -DUSE_CONSOLEKIT=no
-	make
-}
-
-package() {
-        cd  ${srcdir}/build/
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim
-	install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim
-	install -D -m644 ../logrotate "${pkgdir}"/etc/logrotate.d/slim
-
-	# Provide sane defaults
-	sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf
-	sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf
-        # install systemd files
-        install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service
-}
-md5sums=('51543533e492b41007811f7d880720fa'
-         'd8ea9c4dee2811524b67f4f666311a1f'
-         '37ef35079139544d04b8316c7f66f754'
-         '43da096480bf72c3ccec8ad8400f34f0'
-         'a5d6bde9e63899df7d2081e1585bbe54'
-         'ebcb6829028615686de7b64ceeaaf8ed'
-         '6d19bd7a91592ed2bb902b22b9594565'
-         '9efc4e0d82d354f0c578be7723870769')
diff --git a/staging/slim/fix-glibc-segfault-1.3.4.patch b/staging/slim/fix-glibc-segfault-1.3.4.patch
deleted file mode 100644
index b035f8a78..000000000
--- a/staging/slim/fix-glibc-segfault-1.3.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: app.cpp
-===================================================================
---- app.cpp	(revision 223)
-+++ app.cpp	(working copy)
-@@ -593,7 +593,7 @@
- 
-         n++;
- 
--        child_env = static_cast<char**>(malloc(sizeof(char*)*n));
-+        child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
-         memcpy(child_env, old_env, sizeof(char*)*n);
-         child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
-         child_env[n] = NULL;
diff --git a/staging/slim/libpng-1.4+-support.patch b/staging/slim/libpng-1.4+-support.patch
deleted file mode 100644
index 57b39272b..000000000
--- a/staging/slim/libpng-1.4+-support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/image.cpp	2012-06-26 04:20:14.000000000 -0400
-+++ b/image.cpp	2012-06-27 11:41:34.000000000 -0400
-@@ -781,7 +781,11 @@
-                                 (png_infopp) NULL);
-     }
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+    if (setjmp(png_jmpbuf((png_ptr)))) {
-+#else
-     if (setjmp(png_ptr->jmpbuf)) {
-+#endif
-         goto png_destroy;
-     }
- 
diff --git a/staging/slim/logrotate b/staging/slim/logrotate
deleted file mode 100644
index 26ec3b0f4..000000000
--- a/staging/slim/logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/slim.log {
-    compress
-    rotate 1
-    size 1024k
-    notifempty
-    missingok
-    copytruncate
-    noolddir
-}
diff --git a/staging/slim/pam.d b/staging/slim/pam.d
deleted file mode 100644
index 59db5a8c5..000000000
--- a/staging/slim/pam.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-password        required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_loginuid.so
--session	optional	pam_systemd.so
diff --git a/staging/slim/rc.d b/staging/slim/rc.d
deleted file mode 100755
index b0be7ffc5..000000000
--- a/staging/slim/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/slim`
-case "$1" in
-  start)
-    stat_busy "Starting Simple Login Manager"
-    [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon slim
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Simple Login Manager"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon slim
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/slim/session-name.patch b/staging/slim/session-name.patch
deleted file mode 100644
index 8211c4f72..000000000
--- a/staging/slim/session-name.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp
---- slim-1.3.2.old/panel.cpp	2010-10-24 06:01:15.117000019 +0000
-+++ slim-1.3.2.new/panel.cpp	2010-10-24 17:26:30.987999967 +0000
-@@ -23,7 +23,7 @@
-     Root = root;
-     cfg = config;
- 
--    session = "";
-+    session = cfg->nextSession(session);
- 
-     // Init GC
-     XGCValues gcv;
-@@ -188,7 +188,7 @@
- }
- 
- void Panel::ClearPanel() {
--    session = "";
-+    session = cfg->nextSession(session);
-     Reset();
-     XClearWindow(Dpy, Root);
-     XClearWindow(Dpy, Win);
diff --git a/staging/slim/slim.service b/staging/slim/slim.service
deleted file mode 100644
index b894085a0..000000000
--- a/staging/slim/slim.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=SLiM Simple Login Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/slim -nodaemon
-
-[Install]
-Alias=display-manager.service
diff --git a/staging/slim/tty-slowness.patch b/staging/slim/tty-slowness.patch
deleted file mode 100644
index c590fbed8..000000000
--- a/staging/slim/tty-slowness.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp
---- slim-1.3.2.a/app.cpp	2010-08-21 15:10:13.702755711 +0200
-+++ slim-1.3.2.b/app.cpp	2010-08-21 15:10:48.579631179 +0200
-@@ -280,21 +280,22 @@
-         signal(SIGALRM, AlarmSignal);
- 
- #ifndef XNEST_DEBUG
--        OpenLog();
--        
-         if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
-             daemonmode = true;
-         }
- 
-         // Daemonize
-         if (daemonmode) {
--            if (daemon(0, 1) == -1) {
-+            if (daemon(0, 0) == -1) {
-                 cerr << APPNAME << ": " << strerror(errno) << endl;
-                 exit(ERR_EXIT);
-             }
--            UpdatePid();
-         }
- 
-+        OpenLog();
-+
-+        if (daemonmode) UpdatePid();
-+
-         CreateServerAuth();
-         StartServer();
-         alarm(2);
diff --git a/staging/sonata/PKGBUILD b/staging/sonata/PKGBUILD
deleted file mode 100644
index d2a3d8d71..000000000
--- a/staging/sonata/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168713 2012-10-14 19:47:10Z eric $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=sonata
-pkgver=1.6.2.1
-pkgrel=8
-pkgdesc="Elegant GTK+ music client for MPD"
-arch=('i686' 'x86_64')
-url="http://sonata.berlios.de/"
-license=('GPL3')
-depends=('pygtk' 'python2-mpd')
-optdepends=('gnome-python-extras: Enhanced system tray support'
-            'tagpy: Metadata editing support'
-            'python2-dbus: Various extra functionality (e.g. multimedia keys support)')
-source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
-        info.py.patch)
-md5sums=('0b912325e7175abad3bf6c0edc071e05'
-         '595fcf7615035829b264afecb5a1beeb')
-
-build() {
-  cd "$srcdir/${pkgname}-$pkgver"
-  patch -Np0 -i "$srcdir/info.py.patch"
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py
-}
-
-package() {
-  cd "$srcdir/${pkgname}-$pkgver"
-  python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir"
-}
diff --git a/staging/sonata/info.py.patch b/staging/sonata/info.py.patch
deleted file mode 100644
index e95cc3a08..000000000
--- a/staging/sonata/info.py.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- sonata/info.py	2011-07-05 22:32:08.452556016 -0500
-+++ sonata/info.py	2011-07-05 22:45:50.849311466 -0500
-@@ -393,9 +393,9 @@
- 				if content.startswith("#REDIRECT [["):
- 					addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0])
- 					content = urllib.urlopen(addr).read()
--				lyrics = content.split("&lt;lyrics&gt;")[1].split("&lt;/lyrics&gt;")[0]
--				if lyrics.strip() != "&lt;!-- PUT LYRICS HERE (and delete this entire line) --&gt;":
--					lyrics = misc.unescape_html(lyrics)
-+				content = misc.unescape_html(content)
-+				lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip()
-+				if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
- 					lyrics = misc.wiki_to_html(lyrics)
- 					lyrics = lyrics.decode("utf-8")
- # Save lyrics to file:
diff --git a/staging/systemd/PKGBUILD b/staging/systemd/PKGBUILD
deleted file mode 100644
index 18c285073..000000000
--- a/staging/systemd/PKGBUILD
+++ /dev/null
@@ -1,151 +0,0 @@
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Tom Gundersen <teg@jklm.no>
-
-pkgbase=systemd
-pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=194
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2' 'LGPL2.1' 'MIT')
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
-             'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers'
-             'pam' 'python' 'quota-tools' 'xz')
-options=('!libtool')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        'initcpio-hook-udev'
-        'initcpio-install-udev'
-        'initcpio-install-timestamp'
-        '0001-Reinstate-TIMEOUT-handling.patch'
-        'use-split-usr-path.patch')
-md5sums=('0ebb73aea444693b9b86f7a76f5df23c'
-         'e99e9189aa2f6084ac28b8ddf605aeb8'
-         'fb37e34ea006c79be1c54cbb0f803414'
-         'df69615503ad293c9ddf9d8b7755282d'
-         '5543be25f205f853a21fa5ee68e03f0d'
-         'fd5b5f04ab0a847373d357555129d4c0')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # still waiting on ipw2x00, et al to get fixed...
-  patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
-
-  # hang onto this until we do the /{,s}bin merge
-  patch -Np1 <"$srcdir/use-split-usr-path.patch"
-
-  ./configure \
-      --libexecdir=/usr/lib \
-      --localstatedir=/var \
-      --sysconfdir=/etc \
-      --enable-introspection \
-      --enable-gtk-doc \
-      --disable-audit \
-      --disable-ima \
-      --with-distro=arch \
-      --with-usb-ids-path=/usr/share/hwdata/usb.ids \
-      --with-pci-ids-path=/usr/share/hwdata/pci.ids
-
-  make
-}
-
-check() {
-  make -C "$pkgname-$pkgver" check
-}
-
-package_systemd() {
-  pkgdesc="system and service manager"
-  depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
-           'pam' 'util-linux' 'xz')
-  provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver")
-  replaces=('libsystemd' 'systemd-tools' 'udev')
-  conflicts=('libsystemd' 'systemd-tools' 'udev')
-  optdepends=('initscripts: legacy support for /etc/rc.conf'
-              'python2-cairo: systemd-analyze'
-              'python2-dbus: systemd-analyze'
-              'systemd-sysvcompat: symlink package to provide sysvinit binaries'
-              'cryptsetup: required for encrypted block devices'
-              'quota-tools: kernel-level quota management')
-  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-          etc/dbus-1/system.d/org.freedesktop.login1.conf
-          etc/dbus-1/system.d/org.freedesktop.locale1.conf
-          etc/dbus-1/system.d/org.freedesktop.timedate1.conf
-          etc/systemd/system.conf
-          etc/systemd/user.conf
-          etc/systemd/logind.conf
-          etc/systemd/journald.conf
-          etc/udev/udev.conf)
-  install="systemd.install"
-
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
-  install -dm755 "$pkgdir/bin"
-  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
-
-  # move bash-completion and symlink for loginctl
-  install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
-    "$pkgdir/usr/share/bash-completion/completions/systemctl"
-  ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl"
-  rm -rf "$pkgdir/etc/bash_completion.d"
-
-  # don't write units to /etc by default -- we'll enable this on post_install
-  # as a sane default
-  rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
-  rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
-
-  # get rid of RPM macros
-  rm -r "$pkgdir/etc/rpm"
-
-  # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work.
-  # https://pokersource.info/show_bug.cgi?id=50989
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
-  # the path to udevadm is hardcoded in some places
-  install -d "$pkgdir/sbin"
-  ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
-
-  # udevd is no longer udevd because systemd. why isn't udevadm now udevctl?
-  ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd"
-
-  # add back tmpfiles.d/legacy.conf
-  install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
-
-  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
-  sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
-          s#GROUP="tape"#GROUP="storage"#g;
-          s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
-
-  # add mkinitcpio hooks
-  install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
-  install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
-  install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
-
-  # XXX: kill off coredump rule until the journal can recover coredumps
-  rm "$pkgdir/usr/lib/sysctl.d/coredump.conf"
-
-  ### split out manpages for sysvcompat
-  rm -rf "$srcdir/_sysvcompat"
-  install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
-  mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
-     "$srcdir"/_sysvcompat/usr/share/man/man8
-}
-
-package_systemd-sysvcompat() {
-  pkgdesc="sysvinit compat for systemd"
-  conflicts=('sysvinit')
-  depends=('sysvinit-tools')
-
-  mv "$srcdir/_sysvcompat"/* "$pkgdir"
-
-  install -dm755 "$pkgdir/sbin"
-  for tool in runlevel reboot shutdown poweroff halt telinit; do
-    ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool"
-  done
-
-  ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init"
-}
-
-# vim: ft=sh syn=sh et
diff --git a/staging/systemd/initcpio-install-udev b/staging/systemd/initcpio-install-udev
deleted file mode 100644
index 15124b8f7..000000000
--- a/staging/systemd/initcpio-install-udev
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-build() {
-    local rules tool
-
-    add_file "/etc/udev/udev.conf"
-    add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
-    add_binary /usr/bin/udevadm
-
-    for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
-        add_file "/usr/lib/udev/rules.d/$rules"
-    done
-    for tool in ata_id scsi_id; do
-        add_file "/usr/lib/udev/$tool"
-    done
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook will use udev to create your root device node and detect the needed
-modules for your root device. It is also required for firmware loading in
-initramfs. It is recommended to use this hook.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/staging/twisted/PKGBUILD b/staging/twisted/PKGBUILD
deleted file mode 100644
index 35bf73958..000000000
--- a/staging/twisted/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 168774 2012-10-15 21:19:51Z eric $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor:  Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=twisted
-pkgver=12.2.0
-pkgrel=2
-pkgdesc="Asynchronous networking framework written in Python."
-arch=('i686' 'x86_64')
-url="http://twistedmatrix.com/"
-license=('MIT')
-depends=('python2-crypto' 'python2-zope-interface')
-optdepends=('python2-pyopenssl'
-            'python2-soappy: for twisted.web.soap'
-	    'python2-pyasn1: for using conch'
-	    'pygtk: for using manhole'
-	    'tk: for using tkconch')
-install=twisted.install
-source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2)
-sha1sums=('c51834c1270e7a4bb0de9190056e4317413920f9')
-
-build() {
-    cd "$srcdir/Twisted-$pkgver"
-    python2 setup.py build
-}
-
-package() {
-    cd "$srcdir/Twisted-$pkgver"
-    python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-    install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-    sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \
-      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py \
-      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py \
-      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/python/test/pullpipe.py
-}
diff --git a/staging/twisted/twisted.install b/staging/twisted/twisted.install
deleted file mode 100644
index 8e93ffd3c..000000000
--- a/staging/twisted/twisted.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
-}
diff --git a/staging/vde2/PKGBUILD b/staging/vde2/PKGBUILD
deleted file mode 100644
index b4646d06e..000000000
--- a/staging/vde2/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 168790 2012-10-16 00:34:59Z allan $
-# Contributor: Sergej Pupykin
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=vde2
-pkgver=2.3.2
-pkgrel=2
-pkgdesc="Virtual Distributed Ethernet for emulators like qemu"
-url="http://sourceforge.net/projects/vde/"
-license=("GPL" "LGPL" "CUSTOM")
-arch=('i686' 'x86_64')
-depends=('bash' 'libpcap' 'openssl')
-makedepends=('python')
-backup=(etc/conf.d/vde)
-source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2
-        dhcpd.conf.sample
-        iptables.rules.sample
-        vde-config.sample
-        vde-connection.sample
-        vde.conf
-        vde.rc)
-install=vde2.install
-options=(!libtool !makeflags)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \
-             --enable-experimental
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver 
-  make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc libexecdir=$pkgdir/usr/lib/vde2 install
-  install -D -m 755 ../vde.rc $pkgdir/etc/rc.d/vde
-  install -D -m 644 ../vde.conf $pkgdir/etc/conf.d/vde
-  install -D -m 644 ../vde-config.sample $pkgdir/etc/vde/vde-config.sample
-  install -D -m 644 ../vde-connection.sample $pkgdir/etc/vde/vde-connection.sample
-  install -D -m 644 ../dhcpd.conf.sample $pkgdir/usr/share/vde2/dhcpd.conf.sample
-  install -D -m 644 ../iptables.rules.sample $pkgdir/usr/share/vde2/iptables.rules.sample
-  # install slirp license
-  install -D -m 644 COPYING.slirpvde $pkgdir/usr/share/licenses/vde2/COPYING.slirpvde
-}
-
-md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628'
-         '7d9bc56d2e561d849e915000d1c0f269'
-         'a920123fc620bcedbccb703a8d1bdc55'
-         'cb8ace28e8efd4dad128be4be71b3b07'
-         '63033c33565e2030541c5e05e9d9b063'
-         'a22730f051f4840da4a3162a88ff8156'
-         '6c7dc01bc2f039f0ff1682ee70d3d1da')
diff --git a/staging/vde2/dhcpd.conf.sample b/staging/vde2/dhcpd.conf.sample
deleted file mode 100644
index 565a78b27..000000000
--- a/staging/vde2/dhcpd.conf.sample
+++ /dev/null
@@ -1,12 +0,0 @@
-ddns-update-style none;
-
-subnet 192.168.254.0 netmask 255.255.255.0 {
-    range 192.168.254.1 192.168.254.253;
-    option routers 192.168.254.254;
-    option domain-name "virtual.example.com";
-    # find your DNS servers from /etc/resolv.conf
-    # otherwise only pure IP addresses will work
-    option domain-name-servers 192.168.254.254;
-    option broadcast-address 192.168.254.255;
-    default-lease-time 86400;
-}
diff --git a/staging/vde2/iptables.rules.sample b/staging/vde2/iptables.rules.sample
deleted file mode 100644
index ac712ee21..000000000
--- a/staging/vde2/iptables.rules.sample
+++ /dev/null
@@ -1,5 +0,0 @@
-*filter
--A INPUT -i tun -j ACCEPT
--A FORWARD -s 192.168.254.0/255.255.255.0 -j ACCEPT
-*nat
--A POSTROUTING -s 192.168.254.0/24 -j MASQUERADE
diff --git a/staging/vde2/vde-config.sample b/staging/vde2/vde-config.sample
deleted file mode 100644
index c5a5b7d88..000000000
--- a/staging/vde2/vde-config.sample
+++ /dev/null
@@ -1,35 +0,0 @@
-# Set options vde_switch program
-# To activate this vde profile add it to /etc/conf.d/vde
-
-# Global options
-VDE_NUMPORTS="32"  # Number of ports (default 32)
-VDE_HUB="no"       # [yes|no] Make the switch act as a hub
-VDE_FSTP="no"      # [yes|no] Activate the fast spanning tree protocol
-VDE_MAC=""         # Set the Switch MAC address
-VDE_PRIOTIRY=""    # Set the priority for FST (MAC extension)
-VDE_HASHSIZE=""    # Hash table size
-
-# Options from datasock module
-VDE_SOCK="/var/run/vde/sample.sock"  # control directory pathname
-VDE_SOCK_MODE="660"                  # Standard access mode for comm sockets (octal)
-VDE_SOCK_GROUP="root"                # Group owner for comm sockets
-
-# Options from consmgmt module
-VDE_MANAGEMENT_SOCK="/var/run/vde/sample.mgmt"  # path of the management UNIX socket
-VDE_MANAGEMENT_SOCK_MODE="660"                  # management UNIX socket access mode (octal)
-
-# Other options to parse to vde_switch
-VDE_OPTIONS=""
-
-# VDE with internet support
-# You can use either tuntap method or slirpvde method.
-
-# Options from tuntap module
-VDE_TAP=""  # Enable routing through TAP tap interface (comma separated array eg.:"tap0,tap1").
-
-# slirpvde daemon support
-SLIRP="no"         # [yes|no] enable/disable SLIRP daemon support
-SLIRP_DHCP="no"    # [yes|no] turn on the DHCP server for the network autoconfiguration of all the units connected to the VDE
-SLIRP_NETWORK="" # specify the network address (default 10.0.2.0)
-# other options to parse to slirpvde
-SLIRP_OPTIONS=""
-\ No newline at end of file
diff --git a/staging/vde2/vde-connection.sample b/staging/vde2/vde-connection.sample
deleted file mode 100644
index 4a75e1f52..000000000
--- a/staging/vde2/vde-connection.sample
+++ /dev/null
@@ -1,6 +0,0 @@
-# You can add vde switch connections below
-# just without the # at the beginning:
-# vde_plug /var/run/vde/sample.sock = vde_plug /var/run/vde/sample2.sock
-# or if hosts are different use this syntax:
-# vde_plug /var/run/vde/sample.sock = ssh host2 vde_plug /var/run/vde/sample.sock
-
diff --git a/staging/vde2/vde.conf b/staging/vde2/vde.conf
deleted file mode 100644
index bc61dceda..000000000
--- a/staging/vde2/vde.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Set options for a vde daemon script
-#
-# Array for your vde config files, eg.: "internal-net external-net"
-# You need a config file in /etc/vde/ with the same name.
-# Sample config file provided: /etc/vde/vde-config.sample
-VDE_CONFIG="" 
-
-# Array for your dpipe connections, eg.: "connect-switches"
-# You need a config file in /etc/vde/ with the same name.
-# Sample config file provided: /etc/vde/vde-connection.sample
-VDE_CONNECTION=""
-\ No newline at end of file
diff --git a/staging/vde2/vde.rc b/staging/vde2/vde.rc
deleted file mode 100755
index b368f9955..000000000
--- a/staging/vde2/vde.rc
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/vde
-
-case "$1" in
-  start)
-    # bring up all defined profiles
-    for i in $VDE_CONFIG; do
-      [ -e /etc/vde/$i ] && . /etc/vde/$i
-      stat_busy "Starting vde_switch $i"
-      # get options from profile
-      [ -n "$VDE_NUMPORTS" ] && OPTIONS="-n $VDE_NUMPORTS"
-      [ "$VDE_HUB" = "yes" ] && OPTIONS="$OPTIONS -x"
-      [ "$VDE_FSTP" = "yes" ] && OPTIONS="$OPTIONS -F"
-      [ -n "$VDE_MAC" ] && OPTIONS="$OPTIONS --macaddr $VDE_MAC"
-      [ -n "$VDE_PRIORITY" ] && OPTIONS="$OPTIONS --priority $VDE_PRIORITY"
-      [ -n "$VDE_HASH" ] && OPTIONS="$OPTIONS --hashsize $VDE_HASH"
-      [ -n "$VDE_SOCK" ] && OPTIONS="$OPTIONS -s $VDE_SOCK"
-      [ -n "$VDE_SOCK_MODE" ] && OPTIONS="$OPTIONS -m $VDE_SOCK_MODE"
-      [ -n "$VDE_SOCK_GROUP" ] && OPTIONS="$OPTIONS -g $VDE_SOCK_GROUP"
-      [ -n "$VDE_MANAGEMENT_SOCK" ] && OPTIONS="$OPTIONS -M $VDE_MANAGEMENT_SOCK"
-      [ -n "$VDE_MANAGEMENT_SOCK_MODE" ] && OPTIONS="$OPTIONS --mgmtmode $VDE_MANAGEMENT_SOCK_MODE"
-      [ -n "$VDE_TAP" ] && OPTIONS="$OPTIONS -t $VDE_TAP"
-      [ -n "$VDE_OPTIONS" ] && OPTIONS="$OPTIONS $VDE_OPTIONS"
-      vde_switch $OPTIONS -p /var/run/vde-$i.pid -daemon &>/dev/null
-      [ -n "$VDE_SOCK" -a -n "$VDE_SOCK_GROUP" ] && chgrp "$VDE_SOCK_GROUP" "$VDE_SOCK"
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-      if [ "$SLIRP" = "yes" ]; then
-        stat_busy "Starting slirpvde for $i"
-        [ "$SLIRP_DHCP" = "yes" ] && SP_OPTIONS="-D"
-        [ -n "$SLIRP_NETWORK" ] && SP_OPTIONS="$SP_OPTIONS -n $SLIRP_NETWORK"
-        [ -n "$SLIRP_OPTIONS" ] && SP_OPTIONS="$SP_OPTIONS $SLIRP_OPTIONS"
-        [ -n "$VDE_SOCK" ] && SP_OPTIONS="$SP_OPTIONS -s $VDE_SOCK"
-        [ -n "$VDE_SOCK_MODE" ] && SP_OPTIONS="$SP_OPTIONS -m $VDE_SOCK_MODE"
-        [ -n "$VDE_SOCK_GROUP" ] && SP_OPTIONS="$SP_OPTIONS -g $VDE_SOCK_GROUP"
-        slirpvde $SP_OPTIONS -p /var/run/slirpvde-$i.pid -daemon &>/dev/null
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-        unset OPTIONS
-        unset SP_OPTIONS
-      fi
-    done
-    for i in $VDE_CONNECTION; do
-      # connect specified vde_switches
-      if [ "$(grep ^vde_plug /etc/vde/$i)" ]; then
-        stat_busy "Connecting VDE switches $i together..."
-        while read j; do
-          switch="$(echo $j | grep ^vde_plug)"
-          [ -n "$switch" ] && (dpipe $switch &)
-        done </etc/vde/$i
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-      fi
-    done
-    add_daemon vde
-    ;;
-  stop)
-    # kill vde_plug if switches are connected
-    [ -n "$VDE_CONNECTION" ] && killall vde_plug >/dev/null 2>&1
-    for i in $VDE_CONFIG; do
-      [ -e /etc/vde/$i ] && . /etc/vde/$i
-      if [ "$SLIRP" = "yes" ]; then
-        stat_busy "Stopping slirpvde for $i"
-        kill $(cat /var/run/slirpvde-$i.pid) &> /dev/null
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-        rm /var/run/slirpvde-$i.pid &> /dev/null
-      fi
-      stat_busy "Stopping vde_switch $i"
-      kill $(cat /var/run/vde-$i.pid) &> /dev/null
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-      rm /var/run/vde-$i.pid &> /dev/null
-      stat_busy "Removing $i vde sockets"
-      rm -rf $VDE_SOCK $VDE_MANAGEMENT_SOCK
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-    done
-      unset OPTIONS
-      unset SP_OPTIONS
-      [ -e /var/run/vde/gmon.out ] && rm /var/run/vde/gmon.out
-      rm_daemon vde 
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-    *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/vde2/vde2.install b/staging/vde2/vde2.install
deleted file mode 100644
index 74e1710ff..000000000
--- a/staging/vde2/vde2.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-  echo "Change /etc/conf.d/vde to your needs."
-  echo "vde config files should be placed in /etc/vde, sample files are provided."
-  echo "iptables and dhcpd sample files have been installed to '/usr/share/vde2'."
-  echo "Merge those examples, if needed to the according config files."
-}
-
-post_upgrade() {
-  post_install $1
-}
diff --git a/staging/xf86-input-acecad/PKGBUILD b/staging/xf86-input-acecad/PKGBUILD
deleted file mode 100644
index 0a20be8da..000000000
--- a/staging/xf86-input-acecad/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168078 2012-10-05 17:56:18Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-acecad
-pkgver=1.5.0
-pkgrel=5
-pkgdesc="X.Org acecad tablet input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('sysfsutils')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        assign-local-private-after-allocating.patch)
-sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1'
-          '9301020b0ef3c6f2081e957481a88d2e187a7973')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/assign-local-private-after-allocating.patch"
-  ./configure --prefix=/usr
-  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-input-acecad/assign-local-private-after-allocating.patch b/staging/xf86-input-acecad/assign-local-private-after-allocating.patch
deleted file mode 100644
index e3e635a6f..000000000
--- a/staging/xf86-input-acecad/assign-local-private-after-allocating.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 27 Jun 2011 03:13:54 +0000
-Subject: Assign local->private after allocating.
-
-It is detrimental to the user experience when the driver tries to derefernce
-null pointers.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/src/acecad.c b/src/acecad.c
-index ad6d793..604fe91 100644
---- a/src/acecad.c
-+++ b/src/acecad.c
-@@ -343,6 +343,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags)
-         return BadAlloc;
- 
-     memset(priv, 0, sizeof(AceCadPrivateRec));
-+    local->private = priv;
- 
-     local->device_control = DeviceControl;
- 
---
-cgit v0.8.3-6-g21f6
diff --git a/staging/xf86-input-aiptek/PKGBUILD b/staging/xf86-input-aiptek/PKGBUILD
deleted file mode 100644
index b0c5ad004..000000000
--- a/staging/xf86-input-aiptek/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168080 2012-10-05 18:00:48Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-aiptek
-pkgver=1.4.1
-pkgrel=5
-pkgdesc="X.Org Aiptek USB Digital Tablet input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  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-input-elographics/PKGBUILD b/staging/xf86-input-elographics/PKGBUILD
deleted file mode 100644
index ee6ad8451..000000000
--- a/staging/xf86-input-elographics/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 88566 2010-08-24 08:47:16Z jgc $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-elographics
-pkgver=1.4.1
-pkgrel=2
-pkgdesc="X.org Elographics TouchScreen input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a21af744d57f158e6dff9d60a68aaac46b8d726d602911940cb61f4d6bb2c6a4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  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-input-evdev/PKGBUILD b/staging/xf86-input-evdev/PKGBUILD
deleted file mode 100644
index b5ad96195..000000000
--- a/staging/xf86-input-evdev/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168082 2012-10-05 18:10:25Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <Alexander@archlinux.org
-
-pkgname=xf86-input-evdev
-pkgver=2.7.3
-pkgrel=2
-pkgdesc="X.org evdev input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc' 'systemd-tools' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool' '!makeflags')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  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-input-joystick/50-joystick.conf b/staging/xf86-input-joystick/50-joystick.conf
deleted file mode 100644
index 95a295ab0..000000000
--- a/staging/xf86-input-joystick/50-joystick.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "InputClass"
-	Identifier "joystick catchall"
-	MatchIsJoystick "on"
-	MatchDevicePath "/dev/input/event*"
-	Driver "joystick"
-EndSection
diff --git a/staging/xf86-input-joystick/PKGBUILD b/staging/xf86-input-joystick/PKGBUILD
deleted file mode 100644
index 77a304012..000000000
--- a/staging/xf86-input-joystick/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 168084 2012-10-05 18:31:52Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-joystick
-pkgver=1.6.1
-pkgrel=2
-pkgdesc="X.Org Joystick input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        #git-fixes.patch
-        50-joystick.conf)
-sha1sums=('0712652ec6cdb2fca6ad888548b232a4de9cf580'
-          'e1ff3699a0470c6bb78a53f718df9d8521621e11')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  #patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  install -m644 "${srcdir}/50-joystick.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-joystick/git-fixes.patch b/staging/xf86-input-joystick/git-fixes.patch
deleted file mode 100644
index b3afa06cc..000000000
--- a/staging/xf86-input-joystick/git-fixes.patch
+++ /dev/null
@@ -1,399 +0,0 @@
-From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001
-From: Terry Lambert <tlambert@chromium.org>
-Date: Sat, 16 Jul 2011 00:23:22 +0000
-Subject: Return proper default for unknown values in pInfo->device_control.
-
-Signed-off-by: Terry Lambert <tlambert@chromium.org>
-Reviewed-by: Stephane Marchesin <marcheu@chromium.org>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/src/jstk.c b/src/jstk.c
-index ec6b79a..6db0e7c 100644
---- a/src/jstk.c
-+++ b/src/jstk.c
-@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
- 
-     default:
-         ErrorF("unsupported mode=%d\n", what);
--        return !Success;
--        break;
-+        return BadValue;
-     } /* switch (what) */
-     return Success;
- }
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index 3c471ce..d699dcd 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr       dev,
-         DBG(2, ErrorF("jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n"));
-         dev->public.on = FALSE;
-         break;
-+    default:
-+        return BadValue;
-     }
- 
-     return Success;
---
-cgit v0.9.0.2-2-gbebe
-From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001
-From: Devin J. Pohly <djpohly+xorg@gmail.com>
-Date: Sat, 03 Sep 2011 23:00:07 +0000
-Subject: unify capitalization of joystick properties
-
-the axis keys high/low properties were inconsistently capitalized,
-leading to potential confusion as to why one works but not the other.
-
-Signed-off-by: Devin J. Pohly <djpohly+xorg@gmail.com>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/include/joystick-properties.h b/include/joystick-properties.h
-index 49ef800..36f4082 100644
---- a/include/joystick-properties.h
-+++ b/include/joystick-properties.h
-@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING {
- 
- /** Scancodes for axis in high position */
- /* 8 bit, 4 per axis */
--#define JSTK_PROP_AXIS_KEYS_HIGH "Axis keys (high)"
-+#define JSTK_PROP_AXIS_KEYS_HIGH "Axis Keys (high)"
- 
- /** Set the mapping of each button to
-     none, x, y, zx, zy, button, key, speed_multiply,
---
-cgit v0.9.0.2-2-gbebe
-From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sat, 15 Oct 2011 22:47:52 +0000
-Subject: label buttons and axes
-
-Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping.
-Mapping can be changed while running so the labels will be constant.
-
-Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator
-data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X"
-and "Rel Y", representing the aggregated post-calculation data from all axes.
-
-Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de>
----
-diff --git a/man/joystick.man b/man/joystick.man
-index da92ceb..b401de5 100644
---- a/man/joystick.man
-+++ b/man/joystick.man
-@@ -140,7 +140,11 @@ Neither
- .B mode
- nor
- .B axis
--needs to be set to generate extra valuator events.
-+needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with 
-+.I 1
-+, i.e.
-+.I \*qAxis 1\*q
-+for the first axis (being the 3rd valuator).
- Default: not set.
- .TP 7
- .BI "\*qaxis="[<factor>]<axis> \*q
-@@ -318,6 +322,28 @@ and the second and fourth axis to the arrow keys
- The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis.
- The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings.
- 
-+.SH "XI2 Events"
-+If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons:
-+
-+.nf
-+.BI "  Option  \*qMapAxis1\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis2\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis3\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis4\*q      \*q" "mode=none valuator" \*q
-+\ \ ...
-+.BI "  Option  \*qMapButton1\*q      \*q" "button=1" \*q
-+.BI "  Option  \*qMapButton2\*q      \*q" "button=2" \*q
-+.BI "  Option  \*qMapButton3\*q      \*q" "button=3" \*q
-+.BI "  Option  \*qMapButton4\*q      \*q" "button=4" \*q
-+.BI "  Option  \*qMapButton5\*q      \*q" "button=5" \*q
-+\ \ ...
-+.fi
-+
-+You might also want to set the device "floating" to stop it from reporting core events:
-+.nf
-+.BI "  Option  \*qFloating\*q      \*q" "true" \*q
-+.fi
-+
- .SH "NOTES"
- Configuration through
- .I InputClass
-diff --git a/src/jstk.c b/src/jstk.c
-index 6db0e7c..772683f 100644
---- a/src/jstk.c
-+++ b/src/jstk.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
-+ * Copyright 2007-2011 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
-  * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>       
-  *                                                                            
-  * Permission to use, copy, modify, distribute, and sell this software and its
-@@ -21,7 +21,6 @@
-  * PERFORMANCE OF THIS SOFTWARE.
-  */
- 
--
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-@@ -300,6 +299,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-     switch (what) {
-     case DEVICE_INIT: {
-         int m;
-+        char str[32];
-         CARD8 buttonmap[BUTTONMAP_SIZE+1];
-         DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n"));
-         /* Probe device and return if error */
-@@ -312,11 +312,14 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-         }
- 
-         for (m=0; m<=BUTTONMAP_SIZE; m++) {
-+            sprintf(str, "Button %d", m);
-+
-             buttonmap[m] = m;
--	}
-+            btn_labels[m] = MakeAtom(str, strlen(str), TRUE);
-+        }
-+
-+
- 
--            
--            
-         if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, 
-             btn_labels,
-             buttonmap) == FALSE) {
-@@ -331,7 +334,9 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-             if (priv->axis[i].valuator != -1)
-         {
-             DBG(3, ErrorF("Axis %d will be valuator %d\n", i, m));
-+            sprintf(str, "Axis %d", i + 1);
-             priv->axis[i].valuator = m++;
-+            axes_labels[i] = MakeAtom(str, strlen(str), TRUE);
-         }
- 
-         if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels,
-@@ -719,7 +724,6 @@ static XF86ModuleVersionInfo jstkVersionRec =
-                    /* a tool */
- };
- 
--
- /*
-  ***************************************************************************
-  *
-@@ -732,3 +736,6 @@ _X_EXPORT XF86ModuleData joystickModuleData = {
-     jstkDriverPlug,
-     jstkDriverUnplug
- };
-+
-+/* vim: set filetype=c.doxygen ts=4 et: */
-+
---
-cgit v0.9.0.2-2-gbebe
-From e0193debf8f5a72b0a06977d5dea3365ad9cafbe Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 31 Oct 2011 04:27:22 +0000
-Subject: Fix option type for option duplication
-
-xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption
-list.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index d699dcd..e842941 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -253,26 +253,26 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
-     int rc;
-     char name[512] = {0};
-     InputAttributes *attrs = NULL;
--    InputOption *options;
-     InputOption *iopts = NULL, *tmp;
-     DeviceIntPtr dev;
-+    XF86OptionPtr opts;
- 
-     /* duplicate option list, append to name */
--    options = xf86OptionListDuplicate(pInfo->options);
-+    opts = xf86OptionListDuplicate(pInfo->options);
-     strcpy(name, pInfo->name);
-     strcat(name, " (keys)");
--    options = xf86ReplaceStrOption(options, "Name", name);
--    options = xf86ReplaceStrOption(options, "_source", "_driver/joystick");
-+    opts = xf86ReplaceStrOption(opts, "Name", name);
-+    opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick");
- 
--    while(options)
-+    while(opts)
-     {
-         tmp = calloc(1, sizeof(InputOption));
- 
--        tmp->key = xf86OptionName(options);
--        tmp->value = xf86OptionValue(options);
-+        tmp->key = xf86OptionName(opts);
-+        tmp->value = xf86OptionValue(opts);
-         tmp->next = iopts;
-         iopts = tmp;
--        options = xf86NextOption(options);
-+        opts = xf86NextOption(opts);
-     }
- 
-     /* duplicate attribute list */
---
-cgit v0.9.0.2-2-gbebe
-From 7ccf3a75292d71104c976bf6afb389cccaac1a7d Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 31 Oct 2011 04:33:08 +0000
-Subject: Deal with opaque input option types.
-
-ABI 14 made the InputOption type opaque, move the existing code to ifdefs
-and use the new function calls otherwise.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index e842941..a71275a 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -247,13 +247,46 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
-     return Success;
- }
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14
-+static InputOption*
-+input_option_new(InputOption* list, char *key, char *value)
-+{
-+    InputOption *tmp;
-+
-+    tmp = calloc(1, sizeof(*tmp));
-+    tmp->key = key;
-+    tmp->value = value;
-+    tmp->next = list;
-+
-+    return tmp;
-+}
-+
-+static void
-+input_option_free_list(InputOption **list)
-+{
-+    InputOption *iopts = *list;
-+
-+    while(iopts)
-+    {
-+        InputOption *tmp = iopts->next;
-+        free(iopts->key);
-+        free(iopts->value);
-+        free(iopts);
-+        iopts = tmp;
-+    }
-+
-+    *list = NULL;
-+}
-+
-+#endif
-+
- InputInfoPtr
- jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- {
-     int rc;
-     char name[512] = {0};
-     InputAttributes *attrs = NULL;
--    InputOption *iopts = NULL, *tmp;
-+    InputOption *iopts = NULL;
-     DeviceIntPtr dev;
-     XF86OptionPtr opts;
- 
-@@ -266,12 +299,9 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- 
-     while(opts)
-     {
--        tmp = calloc(1, sizeof(InputOption));
--
--        tmp->key = xf86OptionName(opts);
--        tmp->value = xf86OptionValue(opts);
--        tmp->next = iopts;
--        iopts = tmp;
-+        iopts = input_option_new(iopts,
-+                                 xf86OptionName(opts),
-+                                 xf86OptionValue(opts));
-         opts = xf86NextOption(opts);
-     }
- 
-@@ -280,14 +310,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- 
-     rc = NewInputDeviceRequest(iopts, attrs, &dev);
- 
--    while(iopts)
--    {
--        tmp = iopts->next;
--        free(iopts->key);
--        free(iopts->value);
--        free(iopts);
--        iopts = tmp;
--    }
-+    input_option_free_list(&iopts);
- 
-     FreeInputAttributes(attrs);
- 
---
-cgit v0.9.0.2-2-gbebe
-From 411c1838456c055d3f911c54ed58bb11a6bf0da3 Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sun, 13 Nov 2011 17:04:25 +0000
-Subject: man: valuators are not added automatically
-
----
-diff --git a/man/joystick.man b/man/joystick.man
-index b401de5..9f38ceb 100644
---- a/man/joystick.man
-+++ b/man/joystick.man
-@@ -129,9 +129,6 @@ can be one of:
- 
- .B none, relative, accelerated, absolute
- 
--Every axis which's mode is not
--.B none
--will be reported as an additional valuator.
- .TP 7
- .B \*qvaluator\*q
- Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always 
---
-cgit v0.9.0.2-2-gbebe
-From b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sun, 13 Nov 2011 19:36:07 +0000
-Subject: Copy pInfo->driver to option list to fix hotplugging of keyboard device
-
-udev does copy the Driver line to the list of options, but when manually
-specifying the driver in xorg.conf, the option "Driver" is unset. Because we
-do hotplug a sub-device from within the core device, we need the "Driver"
-option to be present in the list.
-
-This should fix archlinux bug #23577:
-  https://bugs.archlinux.org/task/23577
-
-Thanks to Malek for coming up with a fix.
-
-Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index a71275a..241b15d 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
-     strcat(name, " (keys)");
-     opts = xf86ReplaceStrOption(opts, "Name", name);
-     opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick");
-+    opts = xf86AddNewOption(opts, "Driver", pInfo->driver);
- 
-     while(opts)
-     {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/xf86-input-keyboard/PKGBUILD b/staging/xf86-input-keyboard/PKGBUILD
deleted file mode 100644
index 478060eef..000000000
--- a/staging/xf86-input-keyboard/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168086 2012-10-05 18:41:11Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-keyboard
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="X.Org keyboard input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('76651a84f5031f7c6ecf075d55989c04a00689642579df6d1a1bee6d5c2e5f8a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  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-input-mouse/PKGBUILD b/staging/xf86-input-mouse/PKGBUILD
deleted file mode 100644
index 0c075179b..000000000
--- a/staging/xf86-input-mouse/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168088 2012-10-05 18:46:31Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-mouse
-pkgver=1.8.1
-pkgrel=2
-pkgdesc="X.org mouse input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f5b97aac9aab8fa8b933e960631441ae23b18681c8bf3d5007c00da838f9c9c8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-synaptics/10-synaptics.conf b/staging/xf86-input-synaptics/10-synaptics.conf
deleted file mode 100644
index 81a90fb81..000000000
--- a/staging/xf86-input-synaptics/10-synaptics.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Section "InputClass"
-        Identifier "touchpad catchall"
-        Driver "synaptics"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Option "TapButton1" "1"
-        Option "TapButton2" "2"
-        Option "TapButton3" "3"
-EndSection
diff --git a/staging/xf86-input-synaptics/PKGBUILD b/staging/xf86-input-synaptics/PKGBUILD
deleted file mode 100644
index 24a48dcb1..000000000
--- a/staging/xf86-input-synaptics/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 168090 2012-10-05 18:57:54Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Powalowski  <tpowa@archlinux.org>
-# Contributor: Thomas Bächler <thomas@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-input-synaptics
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="Synaptics driver for notebook touchpads"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libxtst' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-replaces=('synaptics')
-provides=('synaptics')
-conflicts=('synaptics')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
-source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        10-synaptics.conf)
-sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920'
-            'bd506a0545c335faa6da7ec42b3f60f2c09b5ed9e26f03003d6f59be88107ee2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  rm -rf "${pkgdir}/usr/share/X11"
-}
diff --git a/staging/xf86-input-vmmouse/PKGBUILD b/staging/xf86-input-vmmouse/PKGBUILD
deleted file mode 100644
index 214429614..000000000
--- a/staging/xf86-input-vmmouse/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168092 2012-10-05 19:03:25Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-vmmouse
-pkgver=12.9.0
-pkgrel=2
-pkgdesc="X.org VMWare Mouse input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc' 'sh')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-groups=('xorg-drivers' 'xorg')
-backup=('etc/X11/xorg.conf.d/50-vmmouse.conf')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('83500beddba2da390389705d482131872fe9be8b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --with-xorg-conf-dir=/etc/X11/xorg.conf.d \
-    --with-udev-rules-dir=/usr/lib/udev/rules.d
-  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}/"
-  rm -rfv ${pkgdir}/usr/{lib,share}/hal
-}
diff --git a/staging/xf86-input-void/PKGBUILD b/staging/xf86-input-void/PKGBUILD
deleted file mode 100644
index 0831ca3a0..000000000
--- a/staging/xf86-input-void/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168094 2012-10-05 19:07:17Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-void
-pkgver=1.4.0
-pkgrel=4
-pkgdesc="X.org void input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  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-input-wacom/70-wacom.rules b/staging/xf86-input-wacom/70-wacom.rules
deleted file mode 100644
index f6aa20835..000000000
--- a/staging/xf86-input-wacom/70-wacom.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-ACTION!="add|change", GOTO="wacom_end"
-
-# Match all serial wacom tablets with a serial ID starting with WACf
-# Notes: We assign NAME though we shouldn't, but currently the server requires it
-#        We assign the lot to subsystem pnp too because server reads NAME from
-#        the parent device. Once all that's fixed, as simple SUBSYSTEM="tty"
-#        will do and the ENV{NAME} can be removed.
-SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
-SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
-
-LABEL="wacom_end"
-
diff --git a/staging/xf86-input-wacom/PKGBUILD b/staging/xf86-input-wacom/PKGBUILD
deleted file mode 100644
index 3e3a2acd4..000000000
--- a/staging/xf86-input-wacom/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168096 2012-10-05 19:11:14Z andyrtr $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: M Rawash <mrawash@gmail.com>
-
-pkgname=xf86-input-wacom
-pkgver=0.17.0
-pkgrel=2
-pkgdesc="X.Org Wacom tablet driver"
-arch=('i686' 'x86_64')
-url="http://linuxwacom.sourceforge.net/"
-license=('GPL')
-backup=('etc/X11/xorg.conf.d/50-wacom.conf')
-depends=('libxi' 'libxrandr' 'libxinerama')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2
-        70-wacom.rules)
-md5sums=('92dffefc3bc30523463f2fa4bc753448'
-         '10db4f8272286690255c1bcc18bfdd92')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 ../70-wacom.rules "$pkgdir/usr/lib/udev/rules.d/70-wacom.rules"
-}
diff --git a/staging/xf86-video-apm/PKGBUILD b/staging/xf86-video-apm/PKGBUILD
deleted file mode 100644
index 6dc7c8dfa..000000000
--- a/staging/xf86-video-apm/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 168102 2012-10-05 20:15:38Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-apm
-pkgver=1.2.5
-pkgrel=2
-pkgdesc="X.org Alliance ProMotion video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  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-ark/PKGBUILD b/staging/xf86-video-ark/PKGBUILD
deleted file mode 100644
index e4ab12bfe..000000000
--- a/staging/xf86-video-ark/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168104 2012-10-05 20:26:50Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-ark
-pkgver=0.7.5
-pkgrel=2
-pkgdesc="X.org ark video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  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-ast/PKGBUILD b/staging/xf86-video-ast/PKGBUILD
deleted file mode 100644
index 448aa5d54..000000000
--- a/staging/xf86-video-ast/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168106 2012-10-05 20:30:31Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-ast
-pkgver=0.97.0
-pkgrel=2
-pkgdesc="X.org ASPEED AST Graphics video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  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/xfce4-session/PKGBUILD b/staging/xfce4-session/PKGBUILD
deleted file mode 100644
index 1a320ff4a..000000000
--- a/staging/xfce4-session/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 168748 2012-10-15 13:21:21Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfce4-session
-pkgver=4.10.0
-pkgrel=6
-pkgdesc="A session manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'xorg-xinit'
-          'hicolor-icon-theme')
-makedepends=('intltool' 'xfce4-dev-tools')
-optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enabled'
-            'xscreensaver: for locking screen with xflock4'
-            'gnome-screensaver: for locking screen with xflock4'
-            'xlockmore: for locking screen with xflock4')
-replaces=('xfce-utils')
-options=('!libtool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        xfce4-session-4.10.0-add-systemd-support.patch)
-sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce'
-            'ffae61c48a4bd0cb51d422cb93f2de9567abaf29085370c455ef349b6a10234b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=8729
-  patch -Np1 -i "$srcdir/xfce4-session-4.10.0-add-systemd-support.patch"
-
-  xdt-autogen
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var \
-    --disable-static \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch b/staging/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch
deleted file mode 100644
index 7ab637b26..000000000
--- a/staging/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c
-index 4076586..90e7873 100644
---- /dev/null
-+++ b/xfce4-session/xfsm-systemd.c
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2012 Christian Hesse
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program 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
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#include <config.h>
-+
-+#include <gio/gio.h>
-+#include <polkit/polkit.h>
-+
-+#include "xfsm-systemd.h"
-+
-+#define SYSTEMD_DBUS_NAME       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE  "org.freedesktop.login1.Manager"
-+#define SYSTEMD_REBOOT_ACTION   "org.freedesktop.login1.reboot"
-+#define SYSTEMD_SHUTDOWN_ACTION "org.freedesktop.login1.power-off"
-+
-+struct _SystemdProxy {
-+        PolkitAuthority *authority;
-+        PolkitSubject *subject;
-+};
-+
-+SystemdProxy *
-+systemd_proxy_new (void)
-+{
-+        SystemdProxy *proxy;
-+
-+        proxy = g_new0 (SystemdProxy, 1);
-+
-+        proxy->authority = polkit_authority_get_sync (NULL, NULL);
-+        proxy->subject = polkit_unix_process_new (getpid());
-+
-+        return proxy;
-+}
-+
-+void
-+systemd_proxy_free (SystemdProxy *proxy)
-+{
-+        g_object_unref (proxy->authority);
-+        g_object_unref (proxy->subject);
-+
-+        g_free (proxy);
-+}
-+
-+gboolean systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const gchar *method, GError **error)
-+{
-+        PolkitAuthorizationResult *res;
-+        GError *local_error = NULL;
-+
-+        *can_method = FALSE;
-+        res = polkit_authority_check_authorization_sync (proxy->authority,
-+                                                         proxy->subject,
-+                                                         method,
-+                                                         NULL,
-+                                                         POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE,
-+                                                         NULL,
-+                                                         &local_error);
-+        if (res == NULL) {
-+                g_propagate_error (error, local_error);
-+                return FALSE;
-+        }
-+
-+        *can_method = polkit_authorization_result_get_is_authorized (res) ||
-+                       polkit_authorization_result_get_is_challenge (res);
-+
-+        g_object_unref (res);
-+
-+        return TRUE;
-+}
-+
-+gboolean systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error)
-+{
-+	return systemd_proxy_can_method(proxy, can_restart, SYSTEMD_REBOOT_ACTION, error);
-+}
-+
-+gboolean systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error)
-+{
-+	return systemd_proxy_can_method(proxy, can_shutdown, SYSTEMD_SHUTDOWN_ACTION, error);
-+}
-+
-+gboolean systemd_proxy_method (SystemdProxy *proxy, const gchar *method, GError **error)
-+{
-+        GDBusConnection *bus;
-+
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-+        g_dbus_connection_call_sync (bus,
-+                                     SYSTEMD_DBUS_NAME,
-+                                     SYSTEMD_DBUS_PATH,
-+                                     SYSTEMD_DBUS_INTERFACE,
-+                                     method,
-+                                     g_variant_new ("(b)", TRUE),
-+                                     NULL, 0, G_MAXINT, NULL, NULL);
-+        g_object_unref (bus);
-+
-+        return TRUE;
-+}
-+
-+gboolean systemd_proxy_restart (SystemdProxy *proxy, GError **error)
-+{
-+	return systemd_proxy_method(proxy, "Reboot", error);
-+}
-+
-+gboolean systemd_proxy_shutdown (SystemdProxy *proxy, GError **error)
-+{
-+	return systemd_proxy_method(proxy, "PowerOff", error);
-+}
-diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h
-index 3fa8317..2c4d868 100644
---- /dev/null
-+++ b/xfce4-session/xfsm-systemd.h
-@@ -0,0 +1,42 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2012 Christian Hesse
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program 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
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#ifndef __SYSTEMD_PROXY_H__
-+#define __SYSTEMD_PROXY_H__
-+
-+#include <glib.h>
-+
-+G_BEGIN_DECLS
-+
-+typedef struct _SystemdProxy SystemdProxy;
-+
-+SystemdProxy *systemd_proxy_new (void);
-+void          systemd_proxy_free (SystemdProxy *proxy);
-+gboolean      systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const char *method, GError **error);
-+gboolean      systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error);
-+gboolean      systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error);
-+gboolean      systemd_proxy_method (SystemdProxy *proxy, const char *method, GError **error);
-+gboolean      systemd_proxy_restart (SystemdProxy *proxy, GError **error);
-+gboolean      systemd_proxy_shutdown (SystemdProxy *proxy, GError **error);
-+
-+G_END_DECLS
-+
-+#endif  /* __SYSTEMD_PROXY_H__ */
-
-commit 518a28c23f110617aad36e64c02cdab6a36adf37
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:21:14 2012 +0200
-
-    ...
-
-diff --git a/configure.in.in b/configure.in.in
-index 9aa4f8f..aa0b8bb 100644
---- a/configure.in
-+++ b/configure.in
-@@ -96,6 +96,33 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0])
- XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84])
- XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0])
- 
-+dnl systemd integration
-+AC_ARG_ENABLE([systemd],
-+              AS_HELP_STRING([--enable-systemd], [Use systemd]),
-+              [with_systemd=$enableval],
-+              [with_systemd=auto])
-+PKG_CHECK_MODULES(SYSTEMD,
-+                  [libsystemd-login polkit-gobject-1],
-+                  [have_systemd=yes], [have_systemd=no])
-+AC_MSG_CHECKING([whether to use systemd])
-+if test x$with_systemd = xauto ; then
-+        if test x$have_systemd = xno ; then
-+                with_systemd=no
-+        else
-+                with_systemd=yes
-+        fi
-+fi
-+AC_MSG_RESULT($with_systemd)
-+if test x$with_systemd = xyes; then
-+        if test x$have_systemd = xno; then
-+                AC_MSG_ERROR([Systemd support explicitly required, but systemd not found])
-+        fi
-+        AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
-+fi
-+AC_SUBST(SYSTEMD_CFLAGS)
-+AC_SUBST(SYSTEMD_LIBS)
-+AM_CONDITIONAL(WITH_SYSTEMD, [test "$with_systemd" = "yes"], [Using systemd])
-+
- dnl Check for debugging support
- XDT_FEATURE_DEBUG([xfsm_debug_default])
- 
-
-commit f1279eba9452f027a2037be77388767437161d51
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:18:16 2012 +0200
-
-    ...
-
-diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
-index 1429abd..077cdf3 100644
---- a/xfce4-session/xfsm-shutdown.c
-+++ b/xfce4-session/xfsm-shutdown.c
-@@ -96,7 +96,11 @@ struct _XfsmShutdown
- {
-   GObject __parent__;
- 
-+#ifdef HAVE_SYSTEMD
-+  SystemdProxy   *systemd_proxy;
-+#else
-   XfsmConsolekit *consolekit;
-+#endif
-   XfsmUPower     *upower;
- 
-   /* kiosk settings */
-@@ -134,7 +138,11 @@ xfsm_shutdown_init (XfsmShutdown *shutdown)
- {
-   XfceKiosk *kiosk;
- 
-+#ifdef HAVE_SYSTEMD
-+  shutdown->systemd_proxy = systemd_proxy_new ();
-+#else
-   shutdown->consolekit = xfsm_consolekit_get ();
-+#endif
-   shutdown->upower = xfsm_upower_get ();
-   shutdown->helper_state = SUDO_NOT_INITIAZED;
-   shutdown->helper_require_password = FALSE;
-@@ -153,7 +161,11 @@ xfsm_shutdown_finalize (GObject *object)
- {
-   XfsmShutdown *shutdown = XFSM_SHUTDOWN (object);
- 
-+#ifdef HAVE_SYSTEMD
-+  systemd_proxy_free (shutdown->systemd_proxy);
-+#else
-   g_object_unref (G_OBJECT (shutdown->consolekit));
-+#endif
-   g_object_unref (G_OBJECT (shutdown->upower));
- 
-   /* close down helper */
-@@ -644,7 +656,11 @@ xfsm_shutdown_try_restart (XfsmShutdown  *shutdown,
-   if (shutdown->helper_state == SUDO_AVAILABLE)
-     return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error);
-   else
-+#ifdef HAVE_SYSTEMD
-+    return systemd_proxy_restart (shutdown->systemd_proxy, error);
-+#else
-     return xfsm_consolekit_try_restart (shutdown->consolekit, error);
-+#endif
- }
- 
- 
-@@ -661,7 +677,11 @@ xfsm_shutdown_try_shutdown (XfsmShutdown  *shutdown,
-   if (shutdown->helper_state == SUDO_AVAILABLE)
-     return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error);
-   else
-+#ifdef HAVE_SYSTEMD
-+    return systemd_proxy_shutdown (shutdown->systemd_proxy, error);
-+#else
-     return xfsm_consolekit_try_shutdown (shutdown->consolekit, error);
-+#endif
- }
- 
- 
-@@ -701,7 +721,11 @@ xfsm_shutdown_can_restart (XfsmShutdown  *shutdown,
-       return TRUE;
-     }
- 
-+#ifdef HAVE_SYSTEMD
-+  if (systemd_proxy_can_restart (shutdown->systemd_proxy, can_restart, error))
-+#else
-   if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error))
-+#endif
-     return TRUE;
- 
-   if (xfsm_shutdown_sudo_init (shutdown, error))
-@@ -728,7 +752,11 @@ xfsm_shutdown_can_shutdown (XfsmShutdown  *shutdown,
-       return TRUE;
-     }
- 
-+#ifdef HAVE_SYSTEMD
-+  if (systemd_proxy_can_shutdown (shutdown->systemd_proxy, can_shutdown, error))
-+#else
-   if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error))
-+#endif
-     return TRUE;
- 
-   if (xfsm_shutdown_sudo_init (shutdown, error))
-
-commit 5aea3fb853683246a537a67423cf5b32076b8dfb
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:03:27 2012 +0200
-
-    ...
-
-diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
-index c015154..7e3b311 100644
---- a/xfce4-session/Makefile.am
-+++ b/xfce4-session/Makefile.am
-@@ -38,8 +38,6 @@ xfce4_session_SOURCES =							\
- 	xfsm-compat-gnome.h						\
- 	xfsm-compat-kde.c						\
- 	xfsm-compat-kde.h						\
--	xfsm-consolekit.c						\
--	xfsm-consolekit.h						\
- 	xfsm-dns.c							\
- 	xfsm-dns.h							\
- 	xfsm-error.c							\
-@@ -65,6 +63,16 @@ xfce4_session_SOURCES =							\
- 	xfsm-upower.c							\
- 	xfsm-upower.h
- 
-+if WITH_SYSTEMD
-+xfce4_session_SOURCES +=						\
-+	xfsm-systemd.c							\
-+	xfsm-systemd.h
-+else
-+xfce4_session_SOURCES +=						\
-+	xfsm-consolekit.c						\
-+	xfsm-consolekit.h
-+endif
-+
- xfce4_session_CFLAGS =							\
- 	$(LIBSM_CFLAGS)							\
- 	$(LIBX11_CFLAGS)						\
-@@ -72,6 +80,7 @@ xfce4_session_CFLAGS =							\
- 	$(DBUS_CFLAGS)							\
- 	$(DBUS_GLIB_CFLAGS)						\
- 	$(LIBWNCK_CFLAGS)						\
-+	$(SYSTEMD_CFLAGS)						\
- 	$(XFCONF_CFLAGS)						\
- 	$(GMODULE_CFLAGS)						\
- 	$(PLATFORM_CFLAGS)
-@@ -91,6 +100,7 @@ xfce4_session_LDADD =							\
- 	$(DBUS_LIBS)							\
- 	$(DBUS_GLIB_LIBS)						\
- 	$(LIBWNCK_LIBS)							\
-+	$(SYSTEMD_LIBS)							\
- 	$(XFCONF_LIBS)							\
- 	-lm
- 
-diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
-index d8757a8..1429abd 100644
---- a/xfce4-session/xfsm-shutdown.c
-+++ b/xfce4-session/xfsm-shutdown.c
-@@ -66,10 +66,13 @@
- #include <xfce4-session/xfsm-fadeout.h>
- #include <xfce4-session/xfsm-global.h>
- #include <xfce4-session/xfsm-legacy.h>
--#include <xfce4-session/xfsm-consolekit.h>
- #include <xfce4-session/xfsm-upower.h>
- 
--
-+#ifdef HAVE_SYSTEMD
-+#include <xfce4-session/xfsm-systemd.h>
-+#else
-+#include <xfce4-session/xfsm-consolekit.h>
-+#endif
- 
- static void xfsm_shutdown_finalize  (GObject      *object);
- static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown);
diff --git a/staging/xfce4-session/xfce4-session.install b/staging/xfce4-session/xfce4-session.install
deleted file mode 100644
index e4f8fd06c..000000000
--- a/staging/xfce4-session/xfce4-session.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# 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/PKGBUILD b/staging/xorg-server/PKGBUILD
deleted file mode 100644
index 03700888d..000000000
--- a/staging/xorg-server/PKGBUILD
+++ /dev/null
@@ -1,196 +0,0 @@
-# $Id: PKGBUILD 168024 2012-10-05 12:03:57Z 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.13.0
-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' 'libgcrypt')
-options=('!libtool')
-source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
-        autoconfig-nvidia.patch
-        autoconfig-sis.patch
-        xvfb-run
-        xvfb-run.1
-        10-quirks.conf)
-sha256sums=('548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a'
-            '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"
-
-  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 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')
-  # see xorg-server-1.13.0/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
-  provides=('X-ABI-VIDEODRV_VERSION=13' 'X-ABI-XINPUT_VERSION=18' 'X-ABI-EXTENSION_VERSION=7.0' '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=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
-           xproto randrproto renderproto xextproto inputproto kbproto 
-           fontsproto pixman videoproto xf86driproto glproto 
-           mesa dri2proto xineramaproto libpciaccess
-           # not technically required but almost every Xorg pkg needs it to build
-           xorg-util-macros)
-
-  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/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/xorg-xdm/PKGBUILD b/staging/xorg-xdm/PKGBUILD
deleted file mode 100644
index 6da8b604c..000000000
--- a/staging/xorg-xdm/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 168625 2012-10-13 15:55:26Z andyrtr $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-pkgname=xorg-xdm
-pkgver=1.1.11
-pkgrel=4
-pkgdesc="X Display Manager"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'systemd')
-makedepends=('pkgconfig' 'xorg-util-macros' 'xtrans')
-backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession)
-options=('!libtool')
-source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2
-        Xsession-loginshell.patch
-        Xsession-xsm.patch
-        xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
-        xdm.pam
-        git_fixes.diff)
-sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47'
-            'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff'
-            '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb'
-            '5f380a2d6f77feb910d77f7f6843fce9b00ff7610c159fc029ee44cc6c23a48a'
-            '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418'
-            '781b5577bb070220d018a11832d0d4a65fd16e130730ba26fb055c3aa68156b2')
-
-build() {
-  cd "${srcdir}/xdm-${pkgver}"
-  # upstream commits - Add some missing malloc failure checks 	2012-01-07
-  patch -Np1 -i "${srcdir}/git_fixes.diff"
-  
-  patch -Np0 -i "${srcdir}/Xsession-loginshell.patch"
-  patch -Np1 -i "${srcdir}/Xsession-xsm.patch"
-  patch -Np0 -i "${srcdir}/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch"
-
-  autoreconf -fi
-  ./configure --prefix=/usr \
-      --disable-xdm-auth \
-      --disable-static \
-      --with-xdmconfigdir=/etc/X11/xdm \
-      --with-xdmscriptdir=/etc/X11/xdm \
-      --with-pixmapdir=/usr/share/xdm/pixmaps
-  make
-}
-
-package() {
-  cd "${srcdir}/xdm-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/var/lib/xdm"
-  install -m755 -d "${pkgdir}/etc/pam.d"
-  install -m644 "${srcdir}/xdm.pam" "${pkgdir}/etc/pam.d/xdm"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  sed -i -e 's/\/X11R6//g' "${pkgdir}"/etc/X11/xdm/*
-
-  sed -i 's|^Alias=.*|Alias=display-manager.service|' \
-    "$pkgdir/usr/lib/systemd/system/xdm.service"
-}
diff --git a/staging/xorg-xdm/Xsession-loginshell.patch b/staging/xorg-xdm/Xsession-loginshell.patch
deleted file mode 100644
index 3710752ef..000000000
--- a/staging/xorg-xdm/Xsession-loginshell.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- config/Xsession.cpp.orig	2008-06-21 13:57:36.000000000 +0000
-+++ config/Xsession.cpp	2008-06-21 14:01:25.000000000 +0000
-@@ -56,11 +56,7 @@
- resources=$HOME/.Xresources
- 
- if [ -s "$startup" ]; then
--	if [ -x "$startup" ]; then
--		exec "$startup"
--	else
--		exec /bin/sh "$startup"
--	fi
-+	exec /bin/sh -ls -c "$startup"
- else
- 	if [ -r "$resources" ]; then
- 		BINDIR/xrdb -load "$resources"
diff --git a/staging/xorg-xdm/Xsession-xsm.patch b/staging/xorg-xdm/Xsession-xsm.patch
deleted file mode 100644
index a2d4d6cc6..000000000
--- a/staging/xorg-xdm/Xsession-xsm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur xdm-1.1.8-orig/config/Xsession.cpp xdm-1.1.8/config/Xsession.cpp
---- xdm-1.1.8-orig/config/Xsession.cpp	2008-05-21 14:08:45.000000000 -0400
-+++ xdm-1.1.8/config/Xsession.cpp	2009-04-28 02:56:11.000000000 -0400
-@@ -54,6 +54,7 @@
- 
- startup=$HOME/.xsession
- resources=$HOME/.Xresources
-+xinitrc=$HOME/.xinitrc
- 
- if [ -s "$startup" ]; then
- 	if [ -x "$startup" ]; then
-@@ -83,5 +84,9 @@
-                 exec `eval $XDESKTOP`
-         }
- #endif
--	exec BINDIR/xsm
-+	if [ -r "$xinitrc" ]; then
-+		exec /bin/sh -ls -c "$xinitrc"
-+	else
-+		exec /bin/sh -l /etc/X11/xinit/xinitrc
-+        fi
- fi
diff --git a/staging/xorg-xdm/git_fixes.diff b/staging/xorg-xdm/git_fixes.diff
deleted file mode 100644
index 69836d488..000000000
--- a/staging/xorg-xdm/git_fixes.diff
+++ /dev/null
@@ -1,673 +0,0 @@
-From 011a2710a69cd345a8ee3a6b2f15407b4c3b355a Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sun, 25 Sep 2011 07:56:15 +0000
-Subject: Require xt >= 1.0 for appdefaultdir
-
-https://bugs.freedesktop.org/show_bug.cgi?id=7237
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/configure.ac b/configure.ac
-index b488f0c..a4222f1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -383,7 +383,7 @@ PKG_CHECK_MODULES(AUTH, xau)
- # Greeter
- #
- 
--PKG_CHECK_MODULES(XDMGREET, xt x11 xext)
-+PKG_CHECK_MODULES(XDMGREET, xt >= 1.0 x11 xext)
- 
- GREETERLIB="${XDMLIBDIR}/libXdmGreet.so"
- AX_DEFINE_DIR(DEF_GREETER_LIB, GREETERLIB, [Location of Xdm Greeter library])
---
-cgit v0.9.0.2-2-gbebe
-From 618039261b0c7f14eb3b32c8f636464369724407 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Wed, 21 Sep 2011 02:11:20 +0000
-Subject: Mark some chars as const to fix gcc -Wwrite-strings warnings
-
-Can't fix all the warnings, due to the Xt API, but can fix a bunch.
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/greeter/greet.c b/greeter/greet.c
-index 539ce17..82e2c21 100644
---- a/greeter/greet.c
-+++ b/greeter/greet.c
-@@ -110,9 +110,9 @@ void    (*__xdm_SessionExit)(struct display *d, int status, int removeAuth) = NU
- void    (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy) = NULL;
- int     (*__xdm_source)(char **environ, char *file) = NULL;
- char    **(*__xdm_defaultEnv)(void) = NULL;
--char    **(*__xdm_setEnv)(char **e, char *name, char *value) = NULL;
-+char    **(*__xdm_setEnv)(char **e, const char *name, const char *value) = NULL;
- char    **(*__xdm_putEnv)(const char *string, char **env) = NULL;
--char    **(*__xdm_parseArgs)(char **argv, char *string) = NULL;
-+char    **(*__xdm_parseArgs)(char **argv, const char *string) = NULL;
- void    (*__xdm_printEnv)(char **e) = NULL;
- char    **(*__xdm_systemEnv)(struct display *d, char *user, char *home) = NULL;
- void    (*__xdm_LogOutOfMem)(const char * fmt, ...) = NULL;
-diff --git a/greeter/verify.c b/greeter/verify.c
-index ea62cd2..5d2ad17 100644
---- a/greeter/verify.c
-+++ b/greeter/verify.c
-@@ -61,7 +61,7 @@ from The Open Group.
- extern char *crypt(const char *, const char *);
- #endif
- 
--static char *envvars[] = {
-+static const char *envvars[] = {
-     "TZ",			/* SYSV and SVR4, but never hurts */
- #if defined(sony) && !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV)
-     "bootdev",
-@@ -94,8 +94,8 @@ static char **
- userEnv (struct display *d, int useSystemPath, char *user, char *home, char *shell)
- {
-     char	**env;
--    char	**envvar;
--    char	*str;
-+    const char	**envvar;
-+    const char	*str;
- 
-     env = defaultEnv ();
-     env = setEnv (env, "DISPLAY", d->name);
-diff --git a/include/dm.h b/include/dm.h
-index 316dd46..4085cae 100644
---- a/include/dm.h
-+++ b/include/dm.h
-@@ -443,7 +443,7 @@ extern void UnsecureDisplay (struct display *d, Display *dpy);
- extern void execute(char **argv, char **environ);
- 
- /* server.c */
--extern char *_SysErrorMsg (int n);
-+extern const char *_SysErrorMsg (int n);
- extern int StartServer (struct display *d);
- extern int WaitForServer (struct display *d);
- extern void ResetServer (struct display *d);
-@@ -462,10 +462,10 @@ extern int Asprintf(char ** ret, const char *restrict format, ...)
-     _X_ATTRIBUTE_PRINTF(2,3);
- # endif
- extern char *localHostname (void);
--extern char **parseArgs (char **argv, char *string);
--extern char **setEnv (char **e, char *name, char *value);
-+extern char **parseArgs (char **argv, const char *string);
-+extern char **setEnv (char **e, const char *name, const char *value);
- extern char **putEnv(const char *string, char **env);
--extern char *getEnv (char **e, char *name);
-+extern char *getEnv (char **e, const char *name);
- extern void CleanUpChild (void);
- extern void freeArgs (char **argv);
- extern void freeEnv (char **env);
-@@ -478,7 +478,7 @@ extern int Verify (struct display *d, struct greet_info *greet, struct verify_in
- extern char *NetworkAddressToHostname (CARD16 connectionType, ARRAY8Ptr connectionAddress);
- extern int AnyWellKnownSockets (void);
- extern void DestroyWellKnownSockets (void);
--extern void SendFailed (struct display *d, char *reason);
-+extern void SendFailed (struct display *d, const char *reason);
- extern void StopDisplay (struct display *d);
- extern void WaitForChild (void);
- extern void WaitForSomething (void);
-diff --git a/include/greet.h b/include/greet.h
-index 6b6689e..0d607ba 100644
---- a/include/greet.h
-+++ b/include/greet.h
-@@ -65,9 +65,9 @@ struct dlfuncs {
-     void (*_DeleteXloginResources)(struct display *d, Display *dpy);
-     int (*_source)(char **environ, char *file);
-     char **(*_defaultEnv)(void);
--    char **(*_setEnv)(char **e, char *name, char *value);
-+    char **(*_setEnv)(char **e, const char *name, const char *value);
-     char **(*_putEnv)(const char *string, char **env);
--    char **(*_parseArgs)(char **argv, char *string);
-+    char **(*_parseArgs)(char **argv, const char *string);
-     void (*_printEnv)(char **e);
-     char **(*_systemEnv)(struct display *d, char *user, char *home);
-     void (*_LogOutOfMem)(const char * fmt, ...);
-@@ -149,9 +149,9 @@ extern	void    (*__xdm_SessionExit)(struct display *d, int status, int removeAut
- extern	void    (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy);
- extern	int     (*__xdm_source)(char **environ, char *file);
- extern	char    **(*__xdm_defaultEnv)(void);
--extern	char    **(*__xdm_setEnv)(char **e, char *name, char *value);
-+extern	char    **(*__xdm_setEnv)(char **e, const char *name, const char *value);
- extern	char    **(*__xdm_putEnv)(const char *string, char **env);
--extern	char    **(*__xdm_parseArgs)(char **argv, char *string);
-+extern	char    **(*__xdm_parseArgs)(char **argv, const char *string);
- extern	void    (*__xdm_printEnv)(char **e);
- extern	char    **(*__xdm_systemEnv)(struct display *d, char *user, char *home);
- extern	void    (*__xdm_LogOutOfMem)(const char * fmt, ...);
-diff --git a/xdm/access.c b/xdm/access.c
-index d0850ad..7035375 100644
---- a/xdm/access.c
-+++ b/xdm/access.c
-@@ -667,7 +667,7 @@ scanHostlist (
- /* Returns non-0 iff string is matched by pattern.  Does case folding.
-  */
- static int
--patternMatch (char *string, char *pattern)
-+patternMatch (const char *string, char *pattern)
- {
-     int	    p, s;
- 
-diff --git a/xdm/auth.c b/xdm/auth.c
-index bbca167..9e5cba2 100644
---- a/xdm/auth.c
-+++ b/xdm/auth.c
-@@ -116,7 +116,7 @@ int chown(int a,int b,int c) {}
- 
- struct AuthProtocol {
-     unsigned short  name_length;
--    char	    *name;
-+    const char	    *name;
-     void	    (*InitAuth)(unsigned short len, char *name);
-     Xauth	    *(*GetAuth)(unsigned short len, char *name);
-     void	    (*GetXdmcpAuth)(
-diff --git a/xdm/file.c b/xdm/file.c
-index 6e929b8..7b7f3d3 100644
---- a/xdm/file.c
-+++ b/xdm/file.c
-@@ -225,7 +225,7 @@ ParseDisplay (char *source, DisplayType *acceptableTypes, int numAcceptable)
- }
- 
- static struct displayMatch {
--	char		*name;
-+	const char	*name;
- 	DisplayType	type;
- } displayTypes[] = {
- 	{ "local",		{ Local, Permanent, FromFile } },
-diff --git a/xdm/resource.c b/xdm/resource.c
-index ece4de3..83901a2 100644
---- a/xdm/resource.c
-+++ b/xdm/resource.c
-@@ -145,10 +145,10 @@ int	choiceTimeout;	/* chooser choice timeout */
- #define DEF_UDP_PORT	"177"	    /* registered XDMCP port, dont change */
- 
- struct dmResources {
--	char	*name, *class;
--	int	type;
--	char	**dm_value;
--	char	*default_value;
-+	const char	*name, *class;
-+	int		type;
-+	char		**dm_value;
-+	const char	*default_value;
- } DmResources[] = {
- { "servers",	"Servers", 	DM_STRING,	&servers,
- 				DEF_SERVER_LINE} ,
-@@ -203,10 +203,10 @@ struct dmResources {
- #define boffset(f)	XtOffsetOf(struct display, f)
- 
- struct displayResource {
--	char	*name, *class;
--	int	type;
--	int	offset;
--	char	*default_value;
-+	const char	*name, *class;
-+	int		type;
-+	int		offset;
-+	const char	*default_value;
- };
- 
- /* resources for managing the server */
-@@ -289,15 +289,16 @@ XrmDatabase	DmResourceDB;
- 
- static void
- GetResource (
--    char    *name,
--    char    *class,
--    int	    valueType,
--    char    **valuep,
--    char    *default_value)
-+    const char    *name,
-+    const char    *class,
-+    int            valueType,
-+    char         **valuep,
-+    const char    *default_value)
- {
-     char	*type;
-     XrmValue	value;
--    char	*string, *new_string;
-+    const char	*string;
-+    char	*new_string;
-     char	str_buf[50];
-     int	len;
- 
-diff --git a/xdm/server.c b/xdm/server.c
-index 7fe55e6..1bb8873 100644
---- a/xdm/server.c
-+++ b/xdm/server.c
-@@ -62,9 +62,9 @@ CatchUsr1 (int n)
-     errno = olderrno;
- }
- 
--char *_SysErrorMsg (int n)
-+const char *_SysErrorMsg (int n)
- {
--    char *s = strerror(n);
-+    const char *s = strerror(n);
-     return (s ? s : "unknown error");
- }
- 
-diff --git a/xdm/util.c b/xdm/util.c
-index 033633a..60aab21 100644
---- a/xdm/util.c
-+++ b/xdm/util.c
-@@ -97,7 +97,7 @@ printEnv (char **e)
- }
- 
- static char *
--makeEnv (char *name, char *value)
-+makeEnv (const char *name, const char *value)
- {
- 	char	*result;
- 
-@@ -111,7 +111,7 @@ makeEnv (char *name, char *value)
- }
- 
- char *
--getEnv (char **e, char *name)
-+getEnv (char **e, const char *name)
- {
- 	int	l = strlen (name);
- 
-@@ -127,7 +127,7 @@ getEnv (char **e, char *name)
- }
- 
- char **
--setEnv (char **e, char *name, char *value)
-+setEnv (char **e, const char *name, const char *value)
- {
- 	char	**new, **old;
- 	char	*newe;
-@@ -207,9 +207,9 @@ freeEnv (char **env)
- #define isblank(c)	((c) == ' ' || c == '\t')
- 
- char **
--parseArgs (char **argv, char *string)
-+parseArgs (char **argv, const char *string)
- {
--	char	*word;
-+	const char *word;
- 	char	*save;
- 	char    **newargv;
- 	int	i;
-diff --git a/xdm/xdmauth.c b/xdm/xdmauth.c
-index 4b945cf..66804a4 100644
---- a/xdm/xdmauth.c
-+++ b/xdm/xdmauth.c
-@@ -44,7 +44,7 @@ static char	auth_name[256];
- static int	auth_name_len;
- 
- static void
--XdmPrintDataHex (char *s, char *a, int l)
-+XdmPrintDataHex (const char *s, const char *a, int l)
- {
-     int	i;
- 
-@@ -56,7 +56,7 @@ XdmPrintDataHex (char *s, char *a, int l)
- 
- # ifdef XDMCP
- static void
--XdmPrintArray8Hex (char *s, ARRAY8Ptr a)
-+XdmPrintArray8Hex (const char *s, ARRAY8Ptr a)
- {
-     XdmPrintDataHex (s, (char *) a->data, a->length);
- }
-diff --git a/xdm/xdmcp.c b/xdm/xdmcp.c
-index 5bc4716..1c34e7c 100644
---- a/xdm/xdmcp.c
-+++ b/xdm/xdmcp.c
-@@ -74,7 +74,7 @@ static void request_respond (struct sockaddr *from, int fromlen, int length, int
- static void send_accept (struct sockaddr *to, int tolen, CARD32 sessionID, ARRAY8Ptr authenticationName, ARRAY8Ptr authenticationData, ARRAY8Ptr authorizationName, ARRAY8Ptr authorizationData, int fd);
- static void send_alive (struct sockaddr *from, int fromlen, int length, int fd);
- static void send_decline (struct sockaddr *to, int tolen, ARRAY8Ptr authenticationName, ARRAY8Ptr authenticationData, ARRAY8Ptr status, int fd);
--static void send_failed (struct sockaddr *from, int fromlen, char *name, CARD32 sessionID, char *reason, int fd);
-+static void send_failed (struct sockaddr *from, int fromlen, const char *name, CARD32 sessionID, const char *reason, int fd);
- static void send_refuse (struct sockaddr *from, int fromlen, CARD32 sessionID, int fd);
- static void send_unwilling (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName, ARRAY8Ptr status, int fd);
- static void send_willing (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName, ARRAY8Ptr status, int fd);
-@@ -1300,7 +1300,7 @@ abort:
- void
- SendFailed (
-     struct display  *d,
--    char	    *reason)
-+    const char	    *reason)
- {
-     Debug ("Display start failed, sending Failed\n");
-     send_failed ((struct sockaddr *)(d->from), d->fromlen, d->name,
-@@ -1311,9 +1311,9 @@ static void
- send_failed (
-     struct sockaddr *from,
-     int		    fromlen,
--    char	    *name,
-+    const char	    *name,
-     CARD32	    sessionID,
--    char	    *reason,
-+    const char	    *reason,
-     int		    fd)
- {
-     static char	buf[256];
-@@ -1416,7 +1416,7 @@ NetworkAddressToHostname (
- # else
- 	    char dotted[20];
- # endif
--	    char *local_name = "";
-+	    const char *local_name = "";
- 	    int af_type;
- 
- # if defined(IPv6) && defined(AF_INET6)
---
-cgit v0.9.0.2-2-gbebe
-From c43eb799774743bc50233eff6643c51a5fbe6899 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Wed, 21 Sep 2011 02:22:48 +0000
-Subject: Fix warnings about printing longs with int type format strings
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/xdm/dm.c b/xdm/dm.c
-index cd0ee25..7bc2605 100644
---- a/xdm/dm.c
-+++ b/xdm/dm.c
-@@ -536,7 +536,7 @@ WaitForChild (void)
- 		  time(&now);
- 		  crash = d->lastReserv &&
- 		    ((now - d->lastReserv) < XDM_BROKEN_INTERVAL);
--		  Debug("time %i %i try %i of %i%s\n", now, d->lastReserv,
-+		  Debug("time %li %li try %i of %i%s\n", now, d->lastReserv,
- 			d->reservTries, d->reservAttempts,
- 			crash ? " crash" : "");
- 
-diff --git a/xdm/xdmauth.c b/xdm/xdmauth.c
-index 66804a4..b3c1c16 100644
---- a/xdm/xdmauth.c
-+++ b/xdm/xdmauth.c
-@@ -234,7 +234,7 @@ XdmGetKey(struct protoDisplay *pdpy, ARRAY8Ptr displayID)
- 	if (line[0] == '#' || sscanf (line, "%s %s", id, key) != 2)
- 	    continue;
- 	bzero(line, sizeof(line));
--	Debug ("Key entry for \"%s\" %d bytes\n", id, strlen(key));
-+	Debug ("Key entry for \"%s\" %ld bytes\n", id, strlen(key));
- 	if (strlen (id) == displayID->length &&
- 	    !strncmp (id, (char *)displayID->data, displayID->length))
- 	{
---
-cgit v0.9.0.2-2-gbebe
-From 8eee942be0db913511b4c53f94829e1201dfdf00 Mon Sep 17 00:00:00 2001
-From: Michał Górny <mgorny@gentoo.org>
-Date: Wed, 28 Sep 2011 19:25:17 +0000
-Subject: Support systemd startup notification.
-
-If libsystemd-daemon support is enabled, xdm uses it to announce its
-startup as soon as the session is established. This gives the user
-opportunity to delay I/O-intensive operations until the X server is
-started so that they would not interfere with its loading while keeping
-the machine busy when user types in his/her login.
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/Makefile.am b/Makefile.am
-index e5f9f5c..bb6b51c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -43,8 +43,13 @@ endif LINT
- if HAVE_SYSTEMD
- systemdsystemunit_DATA = xdm.service
- 
--xdm.service: xdm.service.in
--	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < $< > $@
-+xdm.service: xdm.service.in Makefile
-+if USE_SYSTEMD_DAEMON
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < xdm.service.in > $@
-+else !USE_SYSTEMD_DAEMON
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < xdm.service.in > $@
-+endif !USE_SYSTEMD_DAEMON
-+
- endif HAVE_SYSTEMD
- CLEANFILES = xdm.service
- EXTRA_DIST = xdm.service.in
-diff --git a/configure.ac b/configure.ac
-index a4222f1..fcb37f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -146,6 +146,7 @@ if test "x$USE_SELINUX" != "xno" ; then
- fi
- 
- # Check whether to install systemd unit files, as suggested in daemon(7).
-+# When a full path is specified, this does not require systemd installed.
- AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
- 	[Directory for systemd service files (default from the System and Service Manager)]),,
- 	[with_systemdsystemunitdir=auto])
-@@ -166,6 +167,21 @@ AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [
- ])
- AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$with_systemdsystemunitdir" != "xno"])
- 
-+# Check whether to enable systemd startup notification.
-+# This requires libsystemd-daemon.
-+AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon],
-+	[Add support for systemd startup notification (default is autodetected)]),
-+	[USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
-+AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
-+    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
-+	[AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
-+	[AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
-+	    [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
-+	)]
-+    )
-+])
-+AM_CONDITIONAL(USE_SYSTEMD_DAEMON, [test "x$USE_SYSTEMD_DAEMON" != "xno"])
-+
- # FIXME: Find better test for which OS'es use su -m  - for now, just try to
- # mirror the Imakefile setting of:
- # if  defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(DarwinArchitecture)
-diff --git a/xdm.service.in b/xdm.service.in
-index d15e072..e782dd9 100644
---- a/xdm.service.in
-+++ b/xdm.service.in
-@@ -4,6 +4,8 @@ After=systemd-user-sessions.service
- 
- [Service]
- ExecStart=BINDIR/xdm -nodaemon
-+Type=notify
-+NotifyAccess=all
- 
- [Install]
- Alias=graphical.target.wants/xdm.service
-diff --git a/xdm/Makefile.am b/xdm/Makefile.am
-index aa9765c..797b5c5 100644
---- a/xdm/Makefile.am
-+++ b/xdm/Makefile.am
-@@ -22,11 +22,11 @@
- bin_PROGRAMS = xdm
- 
- AM_CPPFLAGS = -I$(top_srcdir)/include
--AM_CFLAGS = $(CWARNFLAGS) $(XDM_CFLAGS)
-+AM_CFLAGS = $(CWARNFLAGS) $(XDM_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS)
- 
- # The xdm binary needs to export symbols so that they can be used from
- # libXdmGreet.so loaded through a dlopen call from session.c
--AM_LDFLAGS = $(XDM_LIBS) -export-dynamic
-+AM_LDFLAGS = $(XDM_LIBS) $(SYSTEMD_DAEMON_LIBS) -export-dynamic
- 
- xdm_SOURCES =		\
-         access.c	\
-diff --git a/xdm/session.c b/xdm/session.c
-index 5fd47f0..573747d 100644
---- a/xdm/session.c
-+++ b/xdm/session.c
-@@ -81,6 +81,10 @@ extern int key_setnet(struct key_netstarg *arg);
- #  define RTLD_NOW 1
- # endif
- 
-+#ifdef USE_SYSTEMD_DAEMON
-+#include <systemd/sd-daemon.h>
-+#endif
-+
- #ifdef USE_SELINUX
- /* This should be run just before we exec the user session. */
- static int
-@@ -349,6 +353,12 @@ ManageSession (struct display *d)
- 	exit(UNMANAGE_DISPLAY);
- 	}
- 
-+#ifdef USE_SYSTEMD_DAEMON
-+	/* Subsequent notifications will be ignored by systemd
-+	 * and calling this function will clean up the env */
-+	sd_notify(1, "READY=1");
-+#endif
-+
-     /* tell the possibly dynamically loaded greeter function
-      * what data structure formats to expect.
-      * These version numbers are registered with The Open Group. */
---
-cgit v0.9.0.2-2-gbebe
-From 284532c0884893728b75ca37f5d2a9a33f7bc8db Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Sat, 22 Oct 2011 15:14:46 +0000
-Subject: greeter: link against -lXrender if xft is enabled
-
-XmuCvtStringToXftColor uses XRenderParseColor, so require xrender for
-the xft option, and link against it.
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/configure.ac b/configure.ac
-index fcb37f8..d20ae28 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -345,10 +345,10 @@ AC_ARG_WITH(xft,
- 	AS_HELP_STRING([--with-xft],
- 			[Use Xft to draw text (default is YES if installed)]),
- 	[USE_XFT="$withval"],
--	PKG_CHECK_EXISTS(xft, [USE_XFT="yes"], [USE_XFT="no"]))
-+	PKG_CHECK_EXISTS(xft xrender, [USE_XFT="yes"], [USE_XFT="no"]))
- 
- if test "x$USE_XFT" = "xyes" ; then
--	PKG_CHECK_MODULES(XFT, xft)
-+	PKG_CHECK_MODULES(XFT, xft xrender)
- 	GREETER_CFLAGS="$GREETER_CFLAGS $XFT_CFLAGS"
- 	GREETER_LIBS="$GREETER_LIBS $XFT_LIBS"
- 	AC_DEFINE([USE_XFT], 1,
-diff --git a/greeter/Login.c b/greeter/Login.c
-index 99a3932..d899376 100644
---- a/greeter/Login.c
-+++ b/greeter/Login.c
-@@ -86,6 +86,10 @@ from The Open Group.
- # include <X11/extensions/Xinerama.h>
- #endif
- 
-+#ifdef USE_XFT
-+# include <X11/extensions/Xrender.h>
-+#endif
-+
- #ifndef DEBUG
- # define XDM_ASSERT(a)	/* do nothing */
- #else
---
-cgit v0.9.0.2-2-gbebe
-From a02edebf21aae37f8564d7b9fad01d5d2942ad8d Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date: Mon, 07 Nov 2011 16:01:44 +0000
-Subject: Fix build outside of source dir. Fixes distcheck too.
-
-Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/Makefile.am b/Makefile.am
-index bb6b51c..e9da40f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -45,9 +45,9 @@ systemdsystemunit_DATA = xdm.service
- 
- xdm.service: xdm.service.in Makefile
- if USE_SYSTEMD_DAEMON
--	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < xdm.service.in > $@
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < ${srcdir}/xdm.service.in > $@
- else !USE_SYSTEMD_DAEMON
--	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < xdm.service.in > $@
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < ${srcdir}/xdm.service.in > $@
- endif !USE_SYSTEMD_DAEMON
- 
- endif HAVE_SYSTEMD
---
-cgit v0.9.0.2-2-gbebe
-From ad7a54288f62c0266540279dac775ebee68f092e Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date: Thu, 15 Dec 2011 21:14:23 +0000
-Subject: replace <varargs.h> by <stdarg.h>. Spotted my Marco Peereboom with clang.
-
-Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
-Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
----
-diff --git a/greeter/verify.c b/greeter/verify.c
-index 5d2ad17..1221874 100644
---- a/greeter/verify.c
-+++ b/greeter/verify.c
-@@ -48,7 +48,7 @@ from The Open Group.
- # include	<errno.h>
- #elif defined(USE_BSDAUTH)
- # include	<login_cap.h>
--# include	<varargs.h>
-+# include	<stdarg.h>
- # include	<bsd_auth.h>
- #elif defined(USESECUREWARE)
- # include       <sys/types.h>
---
-cgit v0.9.0.2-2-gbebe
-From 78403f6a7420798bf24798811c8c6b936c9ccb34 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Sat, 07 Jan 2012 03:34:30 +0000
-Subject: Add some missing malloc failure checks
-
-Flagged by Solaris Studio 12.3 code analyzer
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/xdm/access.c b/xdm/access.c
-index 7035375..b16a066 100644
---- a/xdm/access.c
-+++ b/xdm/access.c
-@@ -304,6 +304,11 @@ tryagain:
-     if (!hostOrAlias)
- 	return NULL;
-     h = malloc (sizeof (DisplayEntry));
-+    if (!h)
-+    {
-+	LogOutOfMem ("ReadHostEntry: DisplayEntry\n");
-+	return NULL;
-+    }
-     h->hopCount = 1;
-     if (*hostOrAlias == ALIAS_CHARACTER)
-     {
-@@ -423,6 +428,11 @@ tryagain:
-     if (!displayOrAlias)
- 	return NULL;
-     d = malloc (sizeof (DisplayEntry));
-+    if (!d)
-+    {
-+	LogOutOfMem ("ReadDisplayEntry: DisplayEntry\n");
-+	return NULL;
-+    }
-     d->notAllowed = 0;
-     d->notBroadcast = 0;
-     d->chooser = 0;
-diff --git a/xdm/choose.c b/xdm/choose.c
-index 6f077eb..e5e003d 100644
---- a/xdm/choose.c
-+++ b/xdm/choose.c
-@@ -128,6 +128,11 @@ RememberIndirectClient (
- 	    connectionType == i->connectionType)
- 	    return 1;
-     i = malloc (sizeof (IndirectUsersRec));
-+    if (!i)
-+    {
-+	LogOutOfMem ("RememberIndirectClient\n");
-+	return 0;
-+    }
-     if (!XdmcpCopyARRAY8 (clientAddress, &i->client))
-     {
- 	free (i);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch b/staging/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
deleted file mode 100644
index 195858883..000000000
--- a/staging/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- config/GiveConsole.sessreg-utmp-fix-bug177890	2006-07-24 04:20:10.000000000 -0400
-+++ config/GiveConsole	2006-07-24 04:21:16.000000000 -0400
-@@ -8,3 +8,5 @@
- # causing serious grief.
- #
- chown $USER /dev/console
-+exec /usr/bin/sessreg  -a -w "/var/log/wtmp" -u "/run/utmp" \
-+        -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
diff --git a/staging/xorg-xdm/xdm.pam b/staging/xorg-xdm/xdm.pam
deleted file mode 100644
index a0b601db6..000000000
--- a/staging/xorg-xdm/xdm.pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-auth		required	pam_nologin.so
-auth		required	pam_env.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
-session		required	pam_loginuid.so
--session	optional	pam_systemd.so
author	Michał Masłowski <mtjm@mtjm.eu>	2012-10-21 10:47:37 +0200
committer	Michał Masłowski <mtjm@mtjm.eu>	2012-10-21 10:47:37 +0200
commit	aec9ffe68488d34c02bceb4942b87779f5c460d5 (patch)
tree	5aaa0d61510bf94c4dd5bd751b53f61d39817e96 /staging
parent	59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (diff)
parent	9598f5141ea75ffa72a3c7c85639c6f296020ef1 (diff)