Mon Oct 17 14:16:38 UTC 2011

author: Parabola <dev@list.parabolagnulinux.org> 2011-10-17 14:16:38 +0000
committer: Parabola <dev@list.parabolagnulinux.org> 2011-10-17 14:16:38 +0000
commit: e1b3d592f43a99f4ed7c91971deda6ce8414dd69 (patch)
tree: 38fecdc19b201d4d28df13c22e9b3b45bb469e4b /testing
parent: d286d980d2ff42151e9bc81ec348c864c24f9cc4 (diff)
503 files changed, 0 insertions, 27883 deletions
diff --git a/testing/accountsservice/PKGBUILD b/testing/accountsservice/PKGBUILD
deleted file mode 100644
index 25b4577f2..000000000
--- a/testing/accountsservice/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 138834 2011-09-28 19:28:53Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=accountsservice
-pkgver=0.6.14
-pkgrel=1
-pkgdesc="D-Bus interface for user account query and manipulation"
-arch=(i686 x86_64)
-url="http://cgit.freedesktop.org/accountsservice/"
-license=('GPL3')
-depends=('dbus-glib' 'polkit')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('88f4d5d0d1f0ce0fa6a180cbff936041')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/accountsservice \
-    --with-systemdsystemunitdir=/lib/systemd/system \
-    --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/aisleriot/PKGBUILD b/testing/aisleriot/PKGBUILD
deleted file mode 100644
index ac245e1f8..000000000
--- a/testing/aisleriot/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 138836 2011-09-28 19:28:54Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=aisleriot
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="GNOME Solitaire card games"
-arch=(i686 x86_64)
-license=(GPL)
-url="http://www.gnome.org"
-groups=('gnome-extra')
-depends=(libsm gconf guile libcanberra librsvg hicolor-icon-theme dconf)
-makedepends=(gnome-doc-utils intltool itstool)
-options=('!emptydirs' '!libtool')
-install=aisleriot.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('dba561dc35641cb393626151cf048f407c47960c7a254f378b986ab95d899d85')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain aisleriot ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/aisleriot/aisleriot.install b/testing/aisleriot/aisleriot.install
deleted file mode 100644
index 713506dba..000000000
--- a/testing/aisleriot/aisleriot.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  usr/sbin/gconfpkg --install aisleriot
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall aisleriot
-}
-
-post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
-}
diff --git a/testing/anjuta-extras/PKGBUILD b/testing/anjuta-extras/PKGBUILD
deleted file mode 100644
index cd8f56a4a..000000000
--- a/testing/anjuta-extras/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 138840 2011-09-28 19:29:00Z ibiru $
-# Mantainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=anjuta-extras
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Anjuta Integrated Development Environment extra plugins"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('anjuta')
-makedepends=('intltool')
-install=anjuta-extras.install
-url="http://anjuta.sourceforge.net/"
-source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('cda9624952d1e9e5b442c1b972256b618b3d3c6aa3f1069bb6ae1796eecf55a4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/anjuta-extras/anjuta-extras.install b/testing/anjuta-extras/anjuta-extras.install
deleted file mode 100644
index a96048c1d..000000000
--- a/testing/anjuta-extras/anjuta-extras.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/anjuta/PKGBUILD b/testing/anjuta/PKGBUILD
deleted file mode 100644
index 8f53d5426..000000000
--- a/testing/anjuta/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 138838 2011-09-28 19:28:58Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Harley Laue <losinggeneration@yahoo.com>
-
-pkgname=anjuta
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="GNOME Integrated Development Environment (IDE)"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'hicolor-icon-theme' 'vala' 'python2' 'shared-mime-info' 'desktop-file-utils')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-url="http://anjuta.sourceforge.net/"
-install=anjuta.install
-source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('2ff968af17e9202fcdb12c47aadaa9d3cb4b98d78c22db8a0cedcb4bf0a81fb8')
-
-build() {
-  cd "${srcdir}/anjuta-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package(){
-  cd "${srcdir}/anjuta-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  sed -i "1s|#!/usr/bin/python$|&2|" \
-    $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py
-}
diff --git a/testing/anjuta/anjuta.install b/testing/anjuta/anjuta.install
deleted file mode 100644
index c6fcfec11..000000000
--- a/testing/anjuta/anjuta.install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-  update-mime-database usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall anjuta
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/at-spi2-atk/PKGBUILD b/testing/at-spi2-atk/PKGBUILD
deleted file mode 100644
index 865d2eb99..000000000
--- a/testing/at-spi2-atk/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 138844 2011-09-28 19:29:03Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=at-spi2-atk
-pkgver=2.2.0
-pkgrel=1
-pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('at-spi2-core' 'libx11' 'atk' 'dconf')
-makedepends=('intltool')
-install=at-spi2-atk.install
-options=('!libtool')
-groups=('gnome')
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('7fd0e043d2a32f06cab1ca116f36114d9b0c482ca421e26b1d565687db171150')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf --force --install
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/at-spi2-atk/at-spi2-atk.install b/testing/at-spi2-atk/at-spi2-atk.install
deleted file mode 100644
index 2ef26aaa9..000000000
--- a/testing/at-spi2-atk/at-spi2-atk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/at-spi2-core/PKGBUILD b/testing/at-spi2-core/PKGBUILD
deleted file mode 100644
index f7e4d5300..000000000
--- a/testing/at-spi2-core/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 138846 2011-09-28 19:29:05Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=at-spi2-core
-pkgver=2.2.0
-pkgrel=1
-pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('dbus-core' 'glib2' 'libxtst')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('9b3f645560749067ea250c26b281248e3eb912316323a02d358fc2be5dea3848')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf --force --install
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/at-spi2-core --disable-xevie
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/atk/PKGBUILD b/testing/atk/PKGBUILD
deleted file mode 100644
index a13eddcf0..000000000
--- a/testing/atk/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 138842 2011-09-28 19:29:01Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=atk
-pkgver=2.2.0
-pkgrel=1
-pkgdesc="A library providing a set of interfaces for accessibility"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('glib2')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-url='http://www.gtk.org/'
-sha256sums=('8b22f0e7803dd3734c676ccd68ea999ff1156ca49d99c3de5c1d269ad0c3739d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/avidemux/PKGBUILD b/testing/avidemux/PKGBUILD
deleted file mode 100644
index cde42dbd4..000000000
--- a/testing/avidemux/PKGBUILD
+++ /dev/null
@@ -1,120 +0,0 @@
-# $Id: PKGBUILD 139585 2011-10-03 14:22:38Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=avidemux
-pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
-pkgver=2.5.5
-pkgrel=4
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://fixounet.free.fr/avidemux/"
-makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
-             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
-             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse')
-source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz
-        avidemux-2.5.4-x264-build115.patch)
-md5sums=('33bbe210c6826cea1987ed18a41d57a7'
-         '24a18b53a58b678b9e87d30566985751')
-
-build() {
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-
-  patch -Np1 -i "${srcdir}/avidemux-2.5.4-x264-build115.patch"
-
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 ..
-  make
-
-# plugin build expects libraries to be already installed; we fake a prefix
-# in build/ by symlinking all libraries to build/lib/
-  mkdir -p lib
-  cd lib
-  find ../avidemux -name '*.so*' | xargs ln -sft .
-  cd ../../plugins
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \
-    -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \
-    -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \
-    -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON ..
-  make
-}
-
-package_avidemux-cli() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
-  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx')
-  optdepends=('lame: for the corresponding audio encoder plugin'
-              'faac: for the corresponding audio encoder plugin'
-              'faad2: for the corresponding audio decoder plugin'
-              'opencore-amr: for the corresponding audio decoder plugin'
-              'jack: for the corresponding audio device plugin'
-              'libpulse: for the corresponding audio device plugin'
-              'sdl: for the corresponding audio device plugin'
-              'x264: for the corresponding video encoder plugin'
-              'xvidcore: for the corresponding video encoder plugin')
-  provides=('avidemux')
-  conflicts=('avidemux')
-  replaces=('avidemux')
-
-  cd "${srcdir}/${pkgbase}_${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build"
-  make DESTDIR="${pkgdir}" install
-  rm -r "${pkgdir}"/usr/share/avidemux
-  rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4}
-  rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so
-
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so"
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so"
-
-  install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
-  install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
-}
-
-package_avidemux-gtk() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI"
-  depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
-  install=avidemux.install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
-
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
-
-  install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
-  install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
-
-  install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-  sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-}
-
-package_avidemux-qt() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
-  depends=("avidemux-cli=${pkgver}" 'qt' 'desktop-file-utils')
-  install=avidemux.install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
-
-  install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
-  install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
-
-  install -d "${pkgdir}/usr/share/avidemux/i18n"
-  install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n"
-
-  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-}
diff --git a/testing/avidemux/avidemux-2.5.4-x264-build115.patch b/testing/avidemux/avidemux-2.5.4-x264-build115.patch
deleted file mode 100644
index c627667ec..000000000
--- a/testing/avidemux/avidemux-2.5.4-x264-build115.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp	2011-04-28 22:40:26.000000000 +0200
-@@ -488,8 +488,10 @@
- 	printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
- 	printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
- 	printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- 	printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
-+#elif X264_BUILD > 114
-+	printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
- #endif
- 	printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
- #if X264_BUILD > 88
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-04-28 22:43:36.000000000 +0200
-@@ -417,7 +417,7 @@
- 	_param.b_cabac = cabac;
- }
- 
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- unsigned int x264Options::getOpenGopMode(void)
- {
- 	return _param.i_open_gop;
-@@ -428,6 +428,17 @@
- 	if (openGopMode < 3)
- 		_param.i_open_gop = openGopMode;
- }
-+#elif X264_BUILD > 114
-+unsigned int x264Options::getOpenGopMode(void)
-+{
-+        return _param.b_open_gop;
-+}
-+ 
-+void x264Options::setOpenGopMode(unsigned int openGopMode)
-+{
-+        if (openGopMode < 3)
-+                _param.b_open_gop = openGopMode;
-+}
- #endif
- 
- unsigned int x264Options::getInterlaced(void)
diff --git a/testing/avidemux/avidemux.install b/testing/avidemux/avidemux.install
deleted file mode 100644
index e111ef946..000000000
--- a/testing/avidemux/avidemux.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/blender/PKGBUILD b/testing/blender/PKGBUILD
deleted file mode 100644
index ae34b1595..000000000
--- a/testing/blender/PKGBUILD
+++ /dev/null
@@ -1,92 +0,0 @@
-# $Id: PKGBUILD 138152 2011-09-17 21:02:40Z stephane $
-# Contributor: John Sowiak <john@archlinux.org>
-# Maintainer: tobias <tobias@archlinux.org>
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only, we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-#_svn=true
-_svn=false
-
-pkgname=blender
-pkgver=2.59
-pkgrel=3
-epoch=2
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.blender.org"
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
-         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
-         'freetype2' 'openal' 'libsamplerate' 'ffmpeg')
-makedepends=('cmake') # 'subversion'
-install=blender.install
-if [ $_svn = false ]; then
-  source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('6f68fe3c3c2b6a85f1ba9ebc5b1155fe')
-else
-  source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
-  md5sums=('7579d1139d0d6025df8afcfca64a65c4')
-fi
-
-# source PKGBUILD && mksource
-mksource() {
-  _svnver=38016
-  _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
-  _svnmod="$pkgname-$pkgver"
-  mkdir ${pkgname}-$pkgver
-  pushd ${pkgname}-$pkgver
-  svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
-  find . -depth -type d -name .svn -exec rm -rf {} \;
-  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
-  popd
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  mkdir build
-  cd build
-
-  [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF"
-
-  cmake .. \
-    -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-    -DCMAKE_BUILD_TYPE:STRING=Release \
-    -DWITH_INSTALL_PORTABLE:BOOL=OFF \
-    -DWITH_PYTHON_INSTALL:BOOL=OFF \
-    -DWITH_OPENCOLLADA:BOOL=OFF \
-    -DWITH_GAMEENGINE:BOOL=ON \
-    -DWITH_PLAYER:BOOL=ON \
-    -DWITH_BUILTIN_GLEW:BOOL=OFF \
-    -DWITH_CODEC_FFMPEG:BOOL=ON \
-    -DWITH_CODEC_SNDFILE:BOOL=ON \
-    -DPYTHON_VERSION:STRING=3.2 \
-    -DPYTHON_LIBPATH:STRING=/usr/lib \
-    -DPYTHON_LIBRARY:STRING=python3.2mu \
-    -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
-    $ENABLESSE2
-
-  make $MAKEFLAGS
-
-  cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \
-    "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/
-  cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi
-  chmod 755 bmake
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
-  make DESTDIR="${pkgdir}" install
-  python -m compileall "${pkgdir}/usr/share/blender"
-
-# install plugins
-  install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
-  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
-    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
-  cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
-    "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
diff --git a/testing/blender/blender.install b/testing/blender/blender.install
deleted file mode 100644
index f4d7cc443..000000000
--- a/testing/blender/blender.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_remove() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/testing/brasero/PKGBUILD b/testing/brasero/PKGBUILD
deleted file mode 100644
index 60c77a12b..000000000
--- a/testing/brasero/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 138848 2011-09-28 19:29:07Z ibiru $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=brasero
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="A disc burning application for Gnome"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org/projects/brasero"
-license=('GPL')
-options=('!libtool' '!emptydirs')
-depends=('gtk3' 'gstreamer0.10-base-plugins' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'  'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql')
-makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf')
-optdepends=('libburn: alternative back-end'
-            'libisofs: libburn back-end'
-            'dvdauthor: video project'
-            'gstreamer0.10-bad-plugins: video project'
-            'vcdimager: video project')
-replaces=('nautilus-cd-burner')
-install=brasero.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2e34309caefa9b2ca179e11c4501c5bfd2bcd5b8ed20bd959a249e034f54455c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-caches \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
-}
-
diff --git a/testing/brasero/brasero.install b/testing/brasero/brasero.install
deleted file mode 100644
index b6c57055e..000000000
--- a/testing/brasero/brasero.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/bzflag/PKGBUILD b/testing/bzflag/PKGBUILD
deleted file mode 100644
index 2b661fdd9..000000000
--- a/testing/bzflag/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 138154 2011-09-17 21:02:42Z stephane $
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Kevin Piche <kevin@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=bzflag
-pkgver=2.4.0
-pkgrel=2
-pkgdesc='Multiplayer 3D tank battle game'
-url='http://bzflag.org/'
-license=('LGPL')
-options=('!libtool')
-arch=('i686' 'x86_64')
-depends=('curl' 'glew' 'mesa' 'sdl')
-source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
-sha1sums=('af469d63af7143479176ea0ac91ce2eaa6e4561f')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure --prefix=/usr
-	make
-
-	cd misc
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	install -Dm644 misc/bzflag.desktop "${pkgdir}"/usr/share/applications/bzflag.desktop
-	install -Dm644 data/bzflag-48x48.png "${pkgdir}"/usr/share/pixmaps/bzflag-48x48.png
-}
diff --git a/testing/bzip2/PKGBUILD b/testing/bzip2/PKGBUILD
deleted file mode 100644
index 00bfaa834..000000000
--- a/testing/bzip2/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 138430 2011-09-22 23:27:25Z dan $
-# Maintainer:
-# Contributor: Judd <jvinet@zeroflux.org> 
-
-pkgname=bzip2
-pkgver=1.0.6
-pkgrel=2
-pkgdesc="A high-quality data compression program"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://sources.redhat.com/bzip2"
-groups=('base')
-depends=('glibc')
-source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz
-        bzip2-1.0.4-bzip2recover.patch)
-md5sums=('00b516f4704d4a7cb50a1d97e6e8e15b'
-         '8a8bca02bdeaf2fd8913aeb549577e7e')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # add large-file support
-  sed -e 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' -i ./Makefile-libbz2_so
-
-  # use our optimization
-  sed -i "s|-O2|${CFLAGS}|g" Makefile
-  sed -i "s|-O2|${CFLAGS}|g" Makefile-libbz2_so
-
-  patch -Np1 < ../bzip2-1.0.4-bzip2recover.patch
-
-  make -f Makefile-libbz2_so
-  make bzip2 bzip2recover libbz2.a
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make test
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  install -dm755 $pkgdir/bin
-  install -m755 bzip2-shared $pkgdir/bin/bzip2
-  install -m755 bzip2recover $pkgdir/bin
-  ln -sf bzip2 $pkgdir/bin/bunzip2
-  ln -sf bzip2 $pkgdir/bin/bzcat
-
-  install -dm755 $pkgdir/usr/bin
-  install -m755 bzdiff bzgrep bzmore $pkgdir/usr/bin
-
-  install -Dm755 libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0.6
-  ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so
-  ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1
-  ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0
-
-  install -Dm644 libbz2.a ${pkgdir}/usr/lib/libbz2.a
-  ln -sf ../../lib/libbz2.so ${pkgdir}/usr/lib/libbz2.so
-
-  install -Dm644 bzlib.h $pkgdir/usr/include/bzlib.h
-
-  install -Dm644 bzip2.1 $pkgdir/usr/share/man/man1/bzip2.1
-  ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bunzip2.1
-  ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzcat.1
-  ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzip2recover.1
-
-  install -Dm644 $srcdir/${pkgname}-${pkgver}/LICENSE \
-                 $pkgdir/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/bzip2/bzip2-1.0.4-bzip2recover.patch b/testing/bzip2/bzip2-1.0.4-bzip2recover.patch
deleted file mode 100644
index e2bfe1cc1..000000000
--- a/testing/bzip2/bzip2-1.0.4-bzip2recover.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- bzip2-1.0.4/bzip2recover.c.pom	2007-01-03 03:00:55.000000000 +0100
-+++ bzip2-1.0.4/bzip2recover.c	2007-02-05 11:55:17.000000000 +0100
-@@ -309,7 +309,8 @@
-    UInt32      buffHi, buffLo, blockCRC;
-    Char*       p;
- 
--   strcpy ( progName, argv[0] );
-+   strncpy ( progName, argv[0], BZ_MAX_FILENAME-1);
-+   progName[BZ_MAX_FILENAME-1]='\0';
-    inFileName[0] = outFileName[0] = 0;
- 
-    fprintf ( stderr, 
diff --git a/testing/caribou/PKGBUILD b/testing/caribou/PKGBUILD
deleted file mode 100644
index bb62e32fb..000000000
--- a/testing/caribou/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 138850 2011-09-28 19:29:10Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Adam Hani Schakaki <krzd@krzd.net>
-
-pkgname=caribou
-pkgver=0.4.0
-pkgrel=1
-pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Caribou"
-license=('LGPL')
-depends=('pyatspi' 'dbus-python' 'python2-gobject' 'gtk3' 'libxklavier' 'libgee' 'dconf')
-makedepends=('gnome-doc-utils' 'intltool' 'clutter')
-install=caribou.install
-options=(!libtool !emptydirs)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz)
-sha256sums=('9d9aeab26956371e9a8e807e2554be5ca08e32f6a27632598065cf2e85e66d16')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i s'|#!/usr/bin/python|#!/usr/bin/python2|'g tools/{fix_gir,make_schema}.py
-  export PYTHON=/usr/bin/python2
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/caribou \
-    --disable-gtk2-module \
-    --disable-static \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/caribou/caribou.install b/testing/caribou/caribou.install
deleted file mode 100644
index 22ca274a5..000000000
--- a/testing/caribou/caribou.install
+++ /dev/null
@@ -1,13 +0,0 @@
-pkgname=caribou
-
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/cheese/PKGBUILD b/testing/cheese/PKGBUILD
deleted file mode 100644
index c50e8a254..000000000
--- a/testing/cheese/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 138852 2011-09-28 19:29:15Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=cheese
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad' 'clutter-gst'
-         'clutter-gtk' 'mx' 'libgee' 'gnome-video-effects' 'hicolor-icon-theme' 'dconf')
-makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool' 'gobject-introspection')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org/projects/cheese/"
-install=cheese.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('04e32ea45cf7a441dccf72ab08a765b268371878728336b762fb625dd02ad32b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper \
-      --disable-static --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/cheese/cheese.install b/testing/cheese/cheese.install
deleted file mode 100644
index c042fba42..000000000
--- a/testing/cheese/cheese.install
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=cheese
-
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-   if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then
-       usr/sbin/gconfpkg --uninstall $pkgname
-   fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/claws-mail-extra-plugins/PKGBUILD b/testing/claws-mail-extra-plugins/PKGBUILD
deleted file mode 100644
index cc21970ba..000000000
--- a/testing/claws-mail-extra-plugins/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 139133 2011-09-30 07:33:19Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Mildred <mildred593 at online dot fr>
-
-pkgname=claws-mail-extra-plugins
-pkgver=3.7.10
-pkgrel=2
-pkgdesc="Extra plugins for claws-mail"
-url="http://www.claws-mail.org/plugins.php?branch=EXT"
-license=('GPL3')
-arch=('i686' 'x86_64')
-depends=('claws-mail>=3.7.10')
-makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7'
-             'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1'
-             'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata')
-optdepends=('libgtkhtml: for gtkhtml2_viewer plugin'
-            'perl: for perl plugin'
-            'libnotify: for notification plugin'
-            'libcanberra: for notification plugin'
-            'dbus-core: for notification plugin'
-            'libxml2: for gtkhtml2_viewer and rssyl plugins'
-            'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins'
-            'libarchive: for archive plugin'
-            'libytnef: for tnef_parse plugin'
-            'libwebkit: for the fancy webkit html plugin'
-            'libsoup-gnome: for the fancy webkit html plugin'
-            'python2: for python plugin'
-	    'libgdata: for gdata plugin')
-conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin'
-           'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin'
-           'sylpheed-claws-extra-plugins' 'claws-tnef-plugin'
-           'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn')
-replaces=('sylpheed-claws-extra-plugins')
-options=('!libtool' '!strip')
-source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2
-	webkit1.6.1.patch)
-md5sums=('fe782b2d4762c9727e22c1bb7979f7d6'
-         '8b94fa44072331b9c3926607eb42ba26')
-sha1sums=('c5200936cb4811022774e960dc3f43d19eb320cf'
-          '8efd800617406dfe58a14422f243a678c582a90d')
-
-build() {
-  cd "$srcdir/claws-mail-extra-plugins-$pkgver"
-
-  # fix for new webkit api
-  pushd fancy*
-  patch -Np0 -i ${srcdir}/webkit1.6.1.patch
-  popd
-
-  # fix for python2
-  export PYTHON="/usr/bin/python2"
-
-  # fix gdata plugin build
-  sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.2/configure
- 
-  for dir in */; do
-    [[ $dir != geolocation_plugin-* ]] && (
-      cd $dir
-
-      ./configure --prefix=/usr --disable-static
-      make
-    )
-  done
-}
-
-package() {
-  cd "$srcdir/claws-mail-extra-plugins-$pkgver"
-  for dir in */; do
-    [[ $dir != geolocation_plugin-* ]] && 
-      make -C $dir DESTDIR="$pkgdir" install
-  done
-
-  # fix fileconflict with libical, #11485
-  rm -f "$pkgdir/usr/include/ical.h"
-}
diff --git a/testing/claws-mail-extra-plugins/webkit1.6.1.patch b/testing/claws-mail-extra-plugins/webkit1.6.1.patch
deleted file mode 100644
index 82bc5d062..000000000
--- a/testing/claws-mail-extra-plugins/webkit1.6.1.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- src/fancy_viewer.c	2011-07-01 11:50:25.000000000 +0200
-+++ src/fancy_viewer.c	2011-09-30 06:02:45.000000000 +0200
-@@ -83,8 +83,10 @@
- static void download_file_cb(GtkWidget *widget, FancyViewer *viewer);
- #endif
- 
--/*FIXME substitute webkitwebsettings.cpp functions with their API when available */
--gchar* webkit_web_view_get_selected_text(WebKitWebView* webView);
-+#if !WEBKIT_CHECK_VERSION (1,5,1)
-+gchar* webkit_web_view_get_selected_text(WebKitWebView* web_view);
-+#endif
-+
- /*------*/
- static GtkWidget *fancy_get_widget(MimeViewer *_viewer)
- {
-@@ -243,6 +245,8 @@
- 
- 	gtk_print_unix_dialog_set_manual_capabilities(print_dialog,
- 												  GTK_PRINT_CAPABILITY_GENERATE_PS);
-+	gtk_print_unix_dialog_set_manual_capabilities(print_dialog,
-+												  GTK_PRINT_CAPABILITY_PREVIEW);
- 
- 	result = gtk_dialog_run (GTK_DIALOG (dialog));
- 	gtk_widget_hide (dialog);
-@@ -293,7 +297,19 @@
- {
- 	debug_print("fancy_get_selection\n");
- 	FancyViewer *viewer = (FancyViewer *) _viewer;
-+#if WEBKIT_CHECK_VERSION(1,5,1)
-+	viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view));
-+	viewer->window = webkit_dom_document_get_default_view (viewer->doc);
-+	viewer->selection = webkit_dom_dom_window_get_selection (viewer->window);
-+	if (viewer->selection == NULL)
-+		return NULL;
-+	viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL);
-+	if (viewer->range == NULL)
-+		return NULL;
-+	gchar *sel = webkit_dom_range_get_text (viewer->range);
-+#else
- 	gchar *sel = webkit_web_view_get_selected_text(viewer->view);
-+#endif
- 	if (!viewer->view || strlen(sel) == 0) {
- 		g_free(sel);
- 		return NULL;
-@@ -686,7 +702,15 @@
- 	debug_print("Clicked on Search on Web\n");
- 	if (webkit_web_view_has_selection(viewer->view)) {
- 		gchar *search;
-+#if WEBKIT_CHECK_VERSION(1,5,1)
-+		viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view));
-+		viewer->window = webkit_dom_document_get_default_view (viewer->doc);
-+		viewer->selection = webkit_dom_dom_window_get_selection (viewer->window);
-+		viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL);
-+		gchar *tmp = webkit_dom_range_get_text (viewer->range);
-+#else
- 		gchar *tmp = webkit_web_view_get_selected_text(viewer->view);
-+#endif
- 		search = g_strconcat(GOOGLE_SEARCH, tmp, NULL);
- 		webkit_web_view_open(viewer->view, search);
- 		g_free(search);
-@@ -896,7 +920,6 @@
- static gboolean populate_popup_cb (WebKitWebView *view, GtkWidget *menu, 
- 								   FancyViewer *viewer)
- {
--	/*FIXME hack..until webkit does not give the proper way to handle it*/
- 	Plugin *plugin = plugin_get_loaded_by_name("RSSyl");
- 	gtk_container_foreach(GTK_CONTAINER(menu), 
- 						  (GtkCallback)viewer_menu_handler, 
-@@ -941,7 +964,19 @@
- 	if (webkit_web_view_can_copy_clipboard(view)) {
- 		GtkClipboard *wv_clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
- 		const gchar *sel_text;
--		sel_text = (const gchar*)webkit_web_view_get_selected_text(view);
-+#if WEBKIT_CHECK_VERSION(1,5,1)
-+		viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view));
-+		viewer->window = webkit_dom_document_get_default_view (viewer->doc);
-+		viewer->selection = webkit_dom_dom_window_get_selection (viewer->window);
-+		if (viewer->selection == NULL)
-+			return NULL;
-+		viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL);
-+		if (viewer->range == NULL)
-+			return NULL;
-+		sel_text = (const *gchar)webkit_dom_range_get_text (viewer->range);
-+#else
-+		sel_text = (const *gchar)webkit_web_view_get_selected_text(viewer->view);
-+#endif
- 		gtk_clipboard_set_text(wv_clipboard, sel_text, -1);
- 	}
- 	return FALSE;
---- src/fancy_viewer.h	2011-07-01 11:50:25.000000000 +0200
-+++ src/fancy_viewer.h	2011-09-30 06:02:45.000000000 +0200
-@@ -113,6 +113,14 @@
- 	gint              tag;
- 	gint              loading;
- 	gint              stop_previous;
-+
-+	/* DOM Objects */
-+#if WEBKIT_CHECK_VERSION(1,5,1)
-+	WebKitDOMDocument	  *doc;
-+	WebKitDOMDOMWindow    *window;
-+	WebKitDOMDOMSelection *selection;
-+	WebKitDOMRange		  *range;
-+#endif
- };
- #define OPEN_INTERNAL FALSE
- #define OPEN_EXTERNAL TRUE
diff --git a/testing/clutter-gst/PKGBUILD b/testing/clutter-gst/PKGBUILD
deleted file mode 100644
index eca5f998a..000000000
--- a/testing/clutter-gst/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 139157 2011-09-30 11:58:56Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-pkgname=clutter-gst
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="GStreamer bindings for clutter"
-arch=('i686' 'x86_64')
-url="http://www.clutter-project.org/"
-license=('LGPL')
-depends=('clutter' 'gstreamer0.10-base' 'libxdamage')
-makedepends=('gobject-introspection' 'gtk-doc')
-options=('!libtool')
-source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d47b771e1453eec4848bac8d58258058a435319d925b22256a28d348bc8d5270')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/clutter-gtk/PKGBUILD b/testing/clutter-gtk/PKGBUILD
deleted file mode 100644
index 04a0cfd3c..000000000
--- a/testing/clutter-gtk/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 138856 2011-09-28 19:29:20Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=clutter-gtk
-pkgver=1.0.4
-pkgrel=1
-pkgdesc="GTK clutter widget"
-arch=('i686' 'x86_64')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('clutter' 'gtk3')
-makedepends=('gobject-introspection' 'gtk-doc')
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('0741fd2feb7d065dd5949a0b47f9cd740272c1428ca93431dea677acb6de464e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/clutter/PKGBUILD b/testing/clutter/PKGBUILD
deleted file mode 100644
index 65d0ccd70..000000000
--- a/testing/clutter/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 138854 2011-09-28 19:29:18Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=clutter
-pkgver=1.8.0
-pkgrel=1
-pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
-arch=('i686' 'x86_64')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('cogl>=1.8.0' 'mesa' 'json-glib' 'atk' 'libxi')
-makedepends=('gobject-introspection' 'mesa')
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('c8bd379154d40400b19932934dfa05e8a02057bbff2455f09afda7aa6c4b5ef8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-introspection
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/cogl/PKGBUILD b/testing/cogl/PKGBUILD
deleted file mode 100644
index ba28d2e68..000000000
--- a/testing/cogl/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 138858 2011-09-28 19:29:22Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=cogl
-pkgver=1.8.0
-pkgrel=1
-pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer"
-arch=('i686' 'x86_64')
-url="http://www.clutter-project.org/"
-license=('GPL2')
-depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
-makedepends=('mesa' 'gobject-introspection')
-options=(!libtool)
-source=(http://download.gnome.org/sources/$pkgname/1.8/$pkgname-$pkgver.tar.xz)
-sha256sums=('b1551c129d5570b63e7130971622fc2ab8d4ecbf0dc1773df1c54fa9c1cb0a2c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/colord/PKGBUILD b/testing/colord/PKGBUILD
deleted file mode 100644
index 6a36d4fa9..000000000
--- a/testing/colord/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 138860 2011-09-28 19:29:23Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=colord
-pkgver=0.1.12
-pkgrel=2
-pkgdesc="Color daemon"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/software/colord/"
-license=('GPL2')
-depends=('lcms2' 'sqlite3' 'polkit' 'udev' 'sane')
-makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x')
-source=($url/releases/$pkgname-$pkgver.tar.xz)
-options=('!libtool')
-sha1sums=(9bc0c4193c0f790702923e0a783962f0f26487e6)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/colord \
-    --localstatedir=/var --disable-static --enable-sane
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/coreutils/PKGBUILD b/testing/coreutils/PKGBUILD
deleted file mode 100644
index 12ce11d7a..000000000
--- a/testing/coreutils/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 140397 2011-10-12 12:51:32Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=coreutils
-pkgver=8.14
-pkgrel=1
-pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.gnu.org/software/coreutils"
-groups=('base')
-depends=('glibc' 'shadow' 'pam' 'acl' 'gmp' 'libcap')
-replaces=('mktemp')
-backup=('etc/pam.d/su')
-install=${pkgname}.install
-options=('!emptydirs')
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}
-	coreutils-uname.patch
-	coreutils-pam.patch
-	su.pam)
-md5sums=('bcb135ce553493a45aba01b39eb3920a'
-         '279712f9afc954beaff0d99194c8f462'
-         'c4fcca138b6abf6d443d48a6f0cd8833'
-         'aad79a2aa6d566c375d7bdd1b0767278'
-         'fa85e5cce5d723275b14365ba71a8aad')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # added su wheel group pam patch (from fedora git)
-  patch -Np1 -i ${srcdir}/coreutils-pam.patch
-
-  # linux specific uname improvement (from gentoo portage)
-  patch -Np1 -i ${srcdir}/coreutils-uname.patch
-
-  autoreconf -v
-  ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \
-              --enable-install-program=su \
-              --enable-no-install-program=groups,hostname,kill,uptime \
-              --enable-pam
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make RUN_EXPENSIVE_TESTS=yes check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  
-  cd ${pkgdir}/usr/bin
-  install -dm755 ${pkgdir}/{bin,usr/sbin}
-  
-  # binaries required by FHS
-  _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \
-        mkdir mknod mv pwd rm rmdir stty su sync true uname"
-  mv ${_fhs} ${pkgdir}/bin
-
-  # binaries required by various Arch scripts
-  _bin="cut dir dircolors du install mkfifo readlink shred \
-        sleep touch tr vdir"
-  mv ${_bin} ${pkgdir}/bin
-  ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep
-
-  mv chroot ${pkgdir}/usr/sbin
-  install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su
-}
diff --git a/testing/coreutils/coreutils-pam.patch b/testing/coreutils/coreutils-pam.patch
deleted file mode 100644
index e61908f3f..000000000
--- a/testing/coreutils/coreutils-pam.patch
+++ /dev/null
@@ -1,428 +0,0 @@
-diff -urNp coreutils-8.4-orig/configure.ac coreutils-8.4/configure.ac
---- coreutils-8.4-orig/configure.ac	2010-01-11 18:20:42.000000000 +0100
-+++ coreutils-8.4/configure.ac	2010-02-12 10:17:46.000000000 +0100
-@@ -126,6 +126,13 @@ if test "$gl_gcc_warnings" = yes; then
-   AC_SUBST([GNULIB_WARN_CFLAGS])
- fi
- 
-+dnl Give the chance to enable PAM
-+AC_ARG_ENABLE(pam, dnl
-+[  --enable-pam              Enable use of the PAM libraries],
-+[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM])
-+LIB_PAM="-ldl -lpam -lpam_misc"
-+AC_SUBST(LIB_PAM)])
-+
- AC_FUNC_FORK
- 
- optional_bin_progs=
-diff -urNp coreutils-8.4-orig/doc/coreutils.texi coreutils-8.4/doc/coreutils.texi
---- coreutils-8.4-orig/doc/coreutils.texi	2010-01-03 18:06:20.000000000 +0100
-+++ coreutils-8.4/doc/coreutils.texi	2010-02-12 10:17:46.000000000 +0100
-@@ -15081,8 +15081,11 @@ to certain shells, etc.).
- @findex syslog
- @command{su} can optionally be compiled to use @code{syslog} to report
- failed, and optionally successful, @command{su} attempts.  (If the system
--supports @code{syslog}.)  However, GNU @command{su} does not check if the
--user is a member of the @code{wheel} group; see below.
-+supports @code{syslog}.)
-+
-+This version of @command{su} has support for using PAM for
-+authentication.  You can edit @file{/etc/pam.d/su} to customize its
-+behaviour.
- 
- The program accepts the following options.  Also see @ref{Common options}.
- 
-@@ -15124,6 +15127,8 @@ environment variables except @env{TERM},
- @env{PATH} to a compiled-in default value.  Change to @var{user}'s home
- directory.  Prepend @samp{-} to the shell's name, intended to make it
- read its login startup file(s).
-+Additionaly @env{DISPLAY} and @env{XAUTHORITY} environment variables 
-+are preserved as well for PAM functionality.
- 
- @item -m
- @itemx -p
-@@ -15163,33 +15168,6 @@ Exit status:
- the exit status of the subshell otherwise
- @end display
- 
--@cindex wheel group, not supported
--@cindex group wheel, not supported
--@cindex fascism
--@subsection Why GNU @command{su} does not support the @samp{wheel} group
--
--(This section is by Richard Stallman.)
--
--@cindex Twenex
--@cindex MIT AI lab
--Sometimes a few of the users try to hold total power over all the
--rest.  For example, in 1984, a few users at the MIT AI lab decided to
--seize power by changing the operator password on the Twenex system and
--keeping it secret from everyone else.  (I was able to thwart this coup
--and give power back to the users by patching the kernel, but I
--wouldn't know how to do that in Unix.)
--
--However, occasionally the rulers do tell someone.  Under the usual
--@command{su} mechanism, once someone learns the root password who
--sympathizes with the ordinary users, he or she can tell the rest.  The
--``wheel group'' feature would make this impossible, and thus cement the
--power of the rulers.
--
--I'm on the side of the masses, not that of the rulers.  If you are
--used to supporting the bosses and sysadmins in whatever they do, you
--might find this idea strange at first.
--
--
- @node timeout invocation
- @section @command{timeout}: Run a command with a time limit
- 
-diff -urNp coreutils-8.4-orig/src/Makefile.am coreutils-8.4/src/Makefile.am
---- coreutils-8.4-orig/src/Makefile.am	2010-01-03 18:06:20.000000000 +0100
-+++ coreutils-8.4/src/Makefile.am	2010-02-12 10:17:46.000000000 +0100
-@@ -361,7 +361,7 @@ factor_LDADD += $(LIB_GMP)
- uptime_LDADD += $(GETLOADAVG_LIBS)
- 
- # for crypt
--su_LDADD += $(LIB_CRYPT)
-+su_LDADD += $(LIB_CRYPT) @LIB_PAM@
- 
- # for various ACL functions
- copy_LDADD += $(LIB_ACL)
-diff -urNp coreutils-8.4-orig/src/su.c coreutils-8.4/src/su.c
---- coreutils-8.4-orig/src/su.c	2010-02-12 10:15:15.000000000 +0100
-+++ coreutils-8.4/src/su.c	2010-02-12 10:24:29.000000000 +0100
-@@ -37,6 +37,16 @@
-    restricts who can su to UID 0 accounts.  RMS considers that to
-    be fascist.
- 
-+#ifdef USE_PAM
-+
-+   Actually, with PAM, su has nothing to do with whether or not a
-+   wheel group is enforced by su.  RMS tries to restrict your access
-+   to a su which implements the wheel group, but PAM considers that
-+   to be fascist, and gives the user/sysadmin the opportunity to
-+   enforce a wheel group by proper editing of /etc/pam.conf
-+
-+#endif
-+
-    Compile-time options:
-    -DSYSLOG_SUCCESS	Log successful su's (by default, to root) with syslog.
-    -DSYSLOG_FAILURE	Log failed su's (by default, to root) with syslog.
-@@ -53,6 +63,15 @@
- #include <pwd.h>
- #include <grp.h>
- 
-+#ifdef USE_PAM
-+# include <signal.h>
-+# include <sys/wait.h>
-+# include <sys/fsuid.h>
-+# include <unistd.h>
-+# include <security/pam_appl.h>
-+# include <security/pam_misc.h>
-+#endif /* USE_PAM */
-+
- #include "system.h"
- #include "getpass.h"
- 
-@@ -120,10 +139,17 @@
- /* The user to become if none is specified.  */
- #define DEFAULT_USER "root"
- 
-+#ifndef USE_PAM
- char *crypt (char const *key, char const *salt);
-+#endif
- 
--static void run_shell (char const *, char const *, char **, size_t)
-+static void run_shell (char const *, char const *, char **, size_t,
-+	const struct passwd *)
-+#ifdef USE_PAM
-+	;
-+#else
-      ATTRIBUTE_NORETURN;
-+#endif
- 
- /* If true, pass the `-f' option to the subshell.  */
- static bool fast_startup;
-@@ -209,7 +235,26 @@ log_su (struct passwd const *pw, bool su
- }
- #endif
- 
-+#ifdef USE_PAM
-+static pam_handle_t *pamh = NULL;
-+static int retval;
-+static struct pam_conv conv = {
-+  misc_conv,
-+  NULL
-+};
-+
-+#define PAM_BAIL_P if (retval) { \
-+  pam_end(pamh, PAM_SUCCESS); \
-+  return 0; \
-+}
-+#define PAM_BAIL_P_VOID if (retval) {		\
-+  pam_end(pamh, PAM_SUCCESS);			\
-+return;						\
-+}
-+#endif
-+
- /* Ask the user for a password.
-+   If PAM is in use, let PAM ask for the password if necessary.
-    Return true if the user gives the correct password for entry PW,
-    false if not.  Return true without asking for a password if run by UID 0
-    or if PW has an empty password.  */
-@@ -217,6 +262,44 @@ log_su (struct passwd const *pw, bool su
- static bool
- correct_password (const struct passwd *pw)
- {
-+#ifdef USE_PAM
-+  struct passwd *caller;
-+  char *tty_name, *ttyn;
-+  retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh);
-+  PAM_BAIL_P;
-+
-+  if (getuid() != 0 && !isatty(0)) {
-+	fprintf(stderr, "standard in must be a tty\n");
-+	exit(1);
-+  }
-+
-+  caller = getpwuid(getuid());
-+  if(caller != NULL && caller->pw_name != NULL) {
-+	  retval = pam_set_item(pamh, PAM_RUSER, caller->pw_name);
-+	  PAM_BAIL_P;
-+  }
-+
-+  ttyn = ttyname(0);
-+  if (ttyn) {
-+    if (strncmp(ttyn, "/dev/", 5) == 0)
-+       tty_name = ttyn+5;
-+    else
-+       tty_name = ttyn;
-+    retval = pam_set_item(pamh, PAM_TTY, tty_name);
-+    PAM_BAIL_P;
-+  }
-+  retval = pam_authenticate(pamh, 0);
-+  PAM_BAIL_P;
-+  retval = pam_acct_mgmt(pamh, 0);
-+  if (retval == PAM_NEW_AUTHTOK_REQD) {
-+    /* password has expired.  Offer option to change it. */
-+    retval = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
-+    PAM_BAIL_P;
-+  }
-+  PAM_BAIL_P;
-+  /* must be authenticated if this point was reached */
-+  return 1;
-+#else /* !USE_PAM */
-   char *unencrypted, *encrypted, *correct;
- #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP
-   /* Shadow passwd stuff for SVR3 and maybe other systems.  */
-@@ -241,6 +324,7 @@ correct_password (const struct passwd *p
-   encrypted = crypt (unencrypted, correct);
-   memset (unencrypted, 0, strlen (unencrypted));
-   return STREQ (encrypted, correct);
-+#endif /* !USE_PAM */
- }
- 
- /* Update `environ' for the new shell based on PW, with SHELL being
-@@ -254,12 +338,18 @@ modify_environment (const struct passwd 
-       /* Leave TERM unchanged.  Set HOME, SHELL, USER, LOGNAME, PATH.
-          Unset all other environment variables.  */
-       char const *term = getenv ("TERM");
-+      char const *display = getenv ("DISPLAY");
-+      char const *xauthority = getenv ("XAUTHORITY");
-       if (term)
-         term = xstrdup (term);
-       environ = xmalloc ((6 + !!term) * sizeof (char *));
-       environ[0] = NULL;
-       if (term)
-         xsetenv ("TERM", term);
-+      if (display)
-+        xsetenv ("DISPLAY", display);
-+      if (xauthority)
-+        xsetenv ("XAUTHORITY", xauthority);
-       xsetenv ("HOME", pw->pw_dir);
-       xsetenv ("SHELL", shell);
-       xsetenv ("USER", pw->pw_name);
-@@ -292,8 +382,13 @@ change_identity (const struct passwd *pw
- {
- #ifdef HAVE_INITGROUPS
-   errno = 0;
--  if (initgroups (pw->pw_name, pw->pw_gid) == -1)
-+  if (initgroups (pw->pw_name, pw->pw_gid) == -1) {
-+#ifdef USE_PAM
-+    pam_close_session(pamh, 0);
-+    pam_end(pamh, PAM_ABORT);
-+#endif
-     error (EXIT_CANCELED, errno, _("cannot set groups"));
-+  }
-   endgrent ();
- #endif
-   if (setgid (pw->pw_gid))
-@@ -302,6 +397,31 @@ change_identity (const struct passwd *pw
-     error (EXIT_CANCELED, errno, _("cannot set user id"));
- }
- 
-+#ifdef USE_PAM
-+static int caught=0;
-+/* Signal handler for parent process later */
-+static void su_catch_sig(int sig)
-+{
-+  ++caught;
-+}
-+
-+int
-+pam_copyenv (pam_handle_t *pamh)
-+{
-+  char **env;
-+
-+  env = pam_getenvlist(pamh);
-+  if(env) {
-+    while(*env) {
-+	if (putenv (*env))
-+	  xalloc_die ();
-+	env++;
-+    }
-+  }
-+  return(0);
-+}
-+#endif
-+
- /* Run SHELL, or DEFAULT_SHELL if SHELL is empty.
-    If COMMAND is nonzero, pass it to the shell with the -c option.
-    Pass ADDITIONAL_ARGS to the shell as more arguments; there
-@@ -309,17 +429,49 @@ change_identity (const struct passwd *pw
- 
- static void
- run_shell (char const *shell, char const *command, char **additional_args,
--           size_t n_additional_args)
-+           size_t n_additional_args, const struct passwd *pw)
- {
-   size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1;
-   char const **args = xnmalloc (n_args, sizeof *args);
-   size_t argno = 1;
-+#ifdef USE_PAM
-+  int child;
-+  sigset_t ourset;
-+  int status;
-+
-+  retval = pam_open_session(pamh,0);
-+  if (retval != PAM_SUCCESS) {
-+    fprintf (stderr, "could not open session\n");
-+    exit (1);
-+  }
-+
-+/* do this at the last possible moment, because environment variables may
-+   be passed even in the session phase
-+*/
-+  if(pam_copyenv(pamh) != PAM_SUCCESS)
-+     fprintf (stderr, "error copying PAM environment\n");
-+  
-+  /* Credentials should be set in the parent */ 
-+  if (pam_setcred(pamh, PAM_ESTABLISH_CRED) != PAM_SUCCESS) {
-+    pam_close_session(pamh, 0);
-+    fprintf(stderr, "could not set PAM credentials\n");
-+    exit(1);
-+  }
-+
-+  child = fork();
-+  if (child == 0) {  /* child shell */
-+  change_identity (pw);
-+  pam_end(pamh, 0);
-+#endif
- 
-   if (simulate_login)
-     {
-       char *arg0;
-       char *shell_basename;
- 
-+      if(chdir(pw->pw_dir))
-+	      error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
-+
-       shell_basename = last_component (shell);
-       arg0 = xmalloc (strlen (shell_basename) + 2);
-       arg0[0] = '-';
-@@ -344,6 +496,67 @@ run_shell (char const *shell, char const
-     error (0, errno, "%s", shell);
-     exit (exit_status);
-   }
-+#ifdef USE_PAM
-+  } else if (child == -1) {
-+      fprintf(stderr, "can not fork user shell: %s", strerror(errno));
-+      pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
-+      pam_close_session(pamh, 0);
-+      pam_end(pamh, PAM_ABORT);
-+      exit(1);
-+  }
-+  /* parent only */
-+  sigfillset(&ourset);
-+  if (sigprocmask(SIG_BLOCK, &ourset, NULL)) {
-+    fprintf(stderr, "%s: signal malfunction\n", PROGRAM_NAME);
-+    caught = 1;
-+  }
-+  if (!caught) {
-+    struct sigaction action;
-+    action.sa_handler = su_catch_sig;
-+    sigemptyset(&action.sa_mask);
-+    action.sa_flags = 0;
-+    sigemptyset(&ourset);
-+    if (sigaddset(&ourset, SIGTERM)
-+        || sigaddset(&ourset, SIGALRM)
-+        || sigaction(SIGTERM, &action, NULL)
-+        || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) {
-+      fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME);
-+      caught = 1;
-+    }
-+  }
-+  if (!caught) {
-+    do {
-+      int pid;
-+
-+      pid = waitpid(-1, &status, WUNTRACED);
-+
-+      if (((pid_t)-1 != pid) && (0 != WIFSTOPPED (status))) {
-+          kill(getpid(), WSTOPSIG(status));
-+          /* once we get here, we must have resumed */
-+          kill(pid, SIGCONT);
-+      }
-+    } while (0 != WIFSTOPPED(status));
-+  }
-+
-+  if (caught) {
-+    fprintf(stderr, "\nSession terminated, killing shell...");
-+    kill (child, SIGTERM);
-+  }
-+  /* Not checking retval on this because we need to call close session */
-+  pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT);
-+  retval = pam_close_session(pamh, 0);
-+  PAM_BAIL_P_VOID;
-+  retval = pam_end(pamh, PAM_SUCCESS);
-+  PAM_BAIL_P_VOID;
-+  if (caught) {
-+    sleep(2);
-+    kill(child, SIGKILL);
-+    fprintf(stderr, " ...killed.\n");
-+    exit(-1);
-+  }
-+  exit ((0 != WIFEXITED (status)) ? WEXITSTATUS (status)
-+                                  : WTERMSIG (status) + 128);
-+#endif /* USE_PAM */
- }
- 
- /* Return true if SHELL is a restricted shell (one not returned by
-@@ -511,9 +724,9 @@ main (int argc, char **argv)
-   shell = xstrdup (shell ? shell : pw->pw_shell);
-   modify_environment (pw, shell);
- 
-+#ifndef USE_PAM
-   change_identity (pw);
--  if (simulate_login && chdir (pw->pw_dir) != 0)
--    error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir);
-+#endif
- 
-   /* error() flushes stderr, but does not check for write failure.
-      Normally, we would catch this via our atexit() hook of
-@@ -523,5 +736,5 @@ main (int argc, char **argv)
-   if (ferror (stderr))
-     exit (EXIT_CANCELED);
- 
--  run_shell (shell, command, argv + optind, MAX (0, argc - optind));
-+  run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw);
- }
diff --git a/testing/coreutils/coreutils-uname.patch b/testing/coreutils/coreutils-uname.patch
deleted file mode 100644
index b458abeba..000000000
--- a/testing/coreutils/coreutils-uname.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-On linux platforms, grok /proc/cpuinfo for the CPU/vendor info.
-
-Prob not suitable for upstream seeing as how it's 100% linux-specific
-http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html
-
-Patch originally by Carlos E. Gorges <carlos@techlinux.com.br>, but 
-heavily reworked to suck less.
-
-To add support for additional platforms, check out the show_cpuinfo()
-func in the linux/arch/<ARCH>/ source tree of the kernel.
-
---- coreutils/src/uname.c
-+++ coreutils/src/uname.c
-@@ -50,6 +50,11 @@
- # include <mach-o/arch.h>
- #endif
- 
-+#if defined(__linux__)
-+# define USE_PROCINFO
-+# define UNAME_HARDWARE_PLATFORM
-+#endif
-+
- #include "system.h"
- #include "error.h"
- #include "quote.h"
-@@ -138,6 +143,117 @@
-   exit (status);
- }
- 
-+#if defined(USE_PROCINFO)
-+
-+# if defined(__s390__) || defined(__s390x__)
-+#  define CPUINFO_FILE    "/proc/sysinfo"
-+#  define CPUINFO_FORMAT  "%64[^\t :]%*[ :]%256[^\n]%c"
-+# else
-+#  define CPUINFO_FILE    "/proc/cpuinfo"
-+#  define CPUINFO_FORMAT  "%64[^\t:]\t:%256[^\n]%c"
-+# endif
-+
-+# define PROCINFO_PROCESSOR      0
-+# define PROCINFO_HARDWARE_PLATFORM 1
-+
-+static void __eat_cpuinfo_space(char *buf)
-+{
-+	/* first eat trailing space */
-+	char *tmp = buf + strlen(buf) - 1;
-+	while (tmp > buf && isspace(*tmp))
-+		*tmp-- = '\0';
-+	/* then eat leading space */
-+	tmp = buf;
-+	while (*tmp && isspace(*tmp))
-+		tmp++;
-+	if (tmp != buf)
-+		memmove(buf, tmp, strlen(tmp)+1);
-+	/* finally collapse whitespace */
-+	tmp = buf;
-+	while (tmp[0] && tmp[1]) {
-+		if (isspace(tmp[0]) && isspace(tmp[1])) {
-+			memmove(tmp, tmp+1, strlen(tmp));
-+			continue;
-+		}
-+		++tmp;
-+	}
-+}
-+
-+static int __linux_procinfo(int x, char *fstr, size_t s)
-+{
-+	FILE *fp;
-+
-+	char *procinfo_keys[] = {
-+		/* --processor --hardware-platform */
-+		#if defined(__alpha__)
-+			"cpu model", "system type"
-+		#elif defined(__arm__)
-+			"Processor", "Hardware"
-+		#elif defined(__avr32__)
-+			"processor", "cpu family"
-+		#elif defined(__bfin__)
-+			"CPU", "BOARD Name"
-+		#elif defined(__cris__)
-+			"cpu", "cpu model"
-+		#elif defined(__frv__)
-+			"CPU-Core", "System"
-+		#elif defined(__i386__) || defined(__x86_64__)
-+			"model name", "vendor_id"
-+		#elif defined(__ia64__)
-+			"family", "vendor"
-+		#elif defined(__hppa__)
-+			"cpu", "model"
-+		#elif defined(__m68k__)
-+			"CPU", "MMU"
-+		#elif defined(__mips__)
-+			"cpu model", "system type"
-+		#elif defined(__powerpc__) || defined(__powerpc64__)
-+			"cpu", "machine"
-+		#elif defined(__s390__) || defined(__s390x__)
-+			"Type", "Manufacturer"
-+		#elif defined(__sh__)
-+			"cpu type", "machine"
-+		#elif defined(sparc) || defined(__sparc__)
-+			"type", "cpu"
-+		#elif defined(__vax__)
-+			"cpu type", "cpu"
-+		#else
-+			"unknown", "unknown"
-+		#endif
-+	};
-+
-+	if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) {
-+		char key[65], value[257], eol, *ret = NULL;
-+
-+		while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) {
-+			__eat_cpuinfo_space(key);
-+			if (!strcmp(key, procinfo_keys[x])) {
-+				__eat_cpuinfo_space(value);
-+				ret = value;
-+				break;
-+			}
-+			if (eol != '\n') {
-+				/* we need two fscanf's here in case the previous
-+				 * length limit caused us to read right up to the
-+				 * newline ... doing "%*[^\n]\n" wont eat the newline
-+				 */
-+				fscanf(fp, "%*[^\n]");
-+				fscanf(fp, "\n");
-+			}
-+		}
-+		fclose(fp);
-+
-+		if (ret) {
-+			strncpy(fstr, ret, s);
-+			return 0;
-+		}
-+	}
-+
-+	return -1;
-+}
-+
-+#endif
-+
- /* Print ELEMENT, preceded by a space if something has already been
-    printed.  */
- 
-@@ -250,10 +344,14 @@ main (int argc, char **argv)
-   if (toprint & PRINT_PROCESSOR)
-     {
-       char const *element = unknown;
--#if HAVE_SYSINFO && defined SI_ARCHITECTURE
-+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
-       {
-         static char processor[257];
-+#if defined(USE_PROCINFO)
-+        if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
-+#else
-         if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
-+#endif
-           element = processor;
-       }
- #endif
-@@ -306,9 +404,13 @@ main (int argc, char **argv)
-       if (element == unknown)
-         {
-           static char hardware_platform[257];
-+#if defined(USE_PROCINFO)
-+          if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
-+#else
-           size_t s = sizeof hardware_platform;
-           static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
-           if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
-+#endif
-             element = hardware_platform;
-         }
- #endif
diff --git a/testing/coreutils/coreutils.install b/testing/coreutils/coreutils.install
deleted file mode 100644
index 8caae6686..000000000
--- a/testing/coreutils/coreutils.install
+++ /dev/null
@@ -1,21 +0,0 @@
-infodir=usr/share/info
-filelist=(coreutils.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
-    usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
diff --git a/testing/coreutils/su.pam b/testing/coreutils/su.pam
deleted file mode 100644
index cf15f40f1..000000000
--- a/testing/coreutils/su.pam
+++ /dev/null
@@ -1,9 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-# Uncomment the following line to implicitly trust users in the "wheel" group.
-#auth		sufficient	pam_wheel.so trust use_uid
-# Uncomment the following line to require a user to be in the "wheel" group.
-#auth		required	pam_wheel.so use_uid
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/testing/cyrus-sasl/0003_saslauthd_mdoc.patch b/testing/cyrus-sasl/0003_saslauthd_mdoc.patch
deleted file mode 100644
index 694f4bb67..000000000
--- a/testing/cyrus-sasl/0003_saslauthd_mdoc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-0003_saslauthd_mdoc.dpatch by  <fabbe@debian.org>
-
-Use the correct path for the saslauthd.conf file, and use another
-date format (cosmetic).
-
-diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc
---- trunk~/saslauthd/saslauthd.mdoc	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/saslauthd.mdoc	2006-07-12 15:05:25.000000000 +0300
-@@ -10,7 +10,7 @@
- .\" manpage in saslauthd.8 whenever you change this source
- .\" version. Only the pre-formatted manpage is installed.
- .\"
--.Dd 10 24 2002
-+.Dd October 24 2002
- .Dt SASLAUTHD 8
- .Os "CMU-SASL"
- .Sh NAME
-@@ -216,7 +216,7 @@
- .Em (All platforms that support OpenLDAP 2.0 or higher)
- .Pp
- Authenticate against an ldap server.  The ldap configuration parameters are
--read from /usr/local/etc/saslauthd.conf.  The location of this file can be
-+read from /etc/saslauthd.conf.  The location of this file can be
- changed with the -O parameter. See the LDAP_SASLAUTHD file included with the
- distribution for the list of available parameters.
- .It Li sia
-@@ -249,7 +249,7 @@
- .Bl -tag -width "/var/run/saslauthd/mux"
- .It Pa /var/run/saslauthd/mux
- The default communications socket.
--.It Pa /usr/local/etc/saslauthd.conf
-+.It Pa /etc/saslauthd.conf
- The default configuration file for ldap support.
- .El
- .Sh SEE ALSO
diff --git a/testing/cyrus-sasl/0010_maintainer_mode.patch b/testing/cyrus-sasl/0010_maintainer_mode.patch
deleted file mode 100644
index cf3d02a08..000000000
--- a/testing/cyrus-sasl/0010_maintainer_mode.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 0010_maintainer_mode.dpatch by  <fabbe@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Enable maintainer mode to avoid auto* problems.
-
-@DPATCH@
-diff -urNad trunk~/configure.in trunk/configure.in
---- trunk~/configure.in	2006-05-29 22:52:46.000000000 +0300
-+++ trunk/configure.in	2006-11-01 23:24:55.000000000 +0200
-@@ -62,6 +62,8 @@
- AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22)
- CMU_INIT_AUTOMAKE
- 
-+AM_MAINTAINER_MODE
-+
- # and include our config dir scripts
- ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config"
- 
diff --git a/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch b/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch
deleted file mode 100644
index 3805b4857..000000000
--- a/testing/cyrus-sasl/0011_saslauthd_ac_prog_libtool.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-0011_saslauthd_ac_prog_libtool.dpatch by  <fabbe@debian.org>
-
-Enable libtool use.
-
-diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in
---- trunk~/saslauthd/configure.in	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/configure.in	2006-11-01 23:41:51.000000000 +0200
-@@ -25,6 +25,7 @@
- AC_PROG_MAKE_SET
- AC_PROG_LN_S
- AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
- 
- dnl Checks for build foo
- CMU_C___ATTRIBUTE__
diff --git a/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch b/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch
deleted file mode 100644
index d50ec8343..000000000
--- a/testing/cyrus-sasl/0012_xopen_crypt_prototype.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-0012_xopen_crypt_prototype.dpatch by  <dannf@debian.org>
-
-When _XOPEN_SOURCE is defined, the subsequent #include <unistd.h>
-will define a correct function prototype for the crypt function.
-This avoids segfaults on architectures where the size of a pointer
-is greater than the size of an integer (ia64 and amd64 are examples).
-This may be detected by looking for build log lines such as the
-following:
-auth_shadow.c:183: warning: implicit declaration of function ‘crypt’
-auth_shadow.c:183: warning: cast to pointer from integer of different
-size
-
-diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c
---- trunk~/saslauthd/auth_shadow.c	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/auth_shadow.c	2006-11-08 13:44:23.000000000 +0200
-@@ -1,3 +1,4 @@
-+#define _XOPEN_SOURCE
- #define PWBUFSZ 256 /***SWB***/
- 
- /* MODULE: auth_shadow */
diff --git a/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch b/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch
deleted file mode 100644
index e9170cef3..000000000
--- a/testing/cyrus-sasl/0016_pid_file_lock_creation_mask.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar <sam@zoy.org>
-
-pid_file_lock is created with a mask of 644 instead of 0644.
-This patch fixes this octal/decimal confusion as well as the
-(harmless) one in the previous umask() call.
-
-diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c
---- trunk~/saslauthd/saslauthd-main.c	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/saslauthd-main.c	2007-06-26 12:07:10.000000000 +0300
-@@ -276,7 +276,7 @@
- 		exit(1);
- 	}
- 
--	umask(077);
-+	umask(0077);
- 
- 	pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1;
- 	if ((pid_file_lock = malloc(pid_file_size)) == NULL) {
-@@ -287,7 +287,7 @@
- 	strlcpy(pid_file_lock, run_path, pid_file_size);
- 	strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size);
- 
--	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) {
-+	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) {
- 		rc = errno;
- 		logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock);
- 		logger(L_ERR, L_FUNC, "open: %s", strerror(rc));
diff --git a/testing/cyrus-sasl/0018_auth_rimap_quotes.patch b/testing/cyrus-sasl/0018_auth_rimap_quotes.patch
deleted file mode 100644
index 13fa999f0..000000000
--- a/testing/cyrus-sasl/0018_auth_rimap_quotes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-0016_auth_rimap_quotes.dpatch by  <fabbe@debian.org>
-
-All lines beginning with `## DP:' are a description of the patch.
-Avoid infinite loop when username/password has a double quote character.
-Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13
-
-diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c
---- etch~/saslauthd/auth_rimap.c	2007-03-29 15:16:20.000000000 +0300
-+++ etch/saslauthd/auth_rimap.c	2008-02-13 13:42:53.000000000 +0200
-@@ -162,6 +162,7 @@
-     num_quotes = 0;
-     p1 = s;
-     while ((p1 = strchr(p1, '"')) != NULL) {
-+	p1++;
- 	num_quotes++;
-     }
-     
-@@ -438,7 +439,7 @@
- 	syslog(LOG_WARNING, "auth_rimap: writev: %m");
- 	memset(qlogin, 0, strlen(qlogin));
- 	free(qlogin);
--	memset(qpass, 0, strlen(qlogin));
-+	memset(qpass, 0, strlen(qpass));
- 	free(qpass);
- 	(void)close(s);
- 	return strdup(RESP_IERROR);
-@@ -447,7 +448,7 @@
-     /* don't need these any longer */
-     memset(qlogin, 0, strlen(qlogin));
-     free(qlogin);
--    memset(qpass, 0, strlen(qlogin));
-+    memset(qpass, 0, strlen(qpass));
-     free(qpass);
- 
-     /* read and parse the LOGIN response */
diff --git a/testing/cyrus-sasl/0019_ldap_deprecated.patch b/testing/cyrus-sasl/0019_ldap_deprecated.patch
deleted file mode 100644
index 8825256cb..000000000
--- a/testing/cyrus-sasl/0019_ldap_deprecated.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-0019_ldap_deprecated.dpatch by  dann frazier <dannf@debian.org>
-
-The function ldap_get_values, used in saslauthd/lak.c, is deprecated.
-Therefore, its prototype is not included by default when compiling
-against the ldap.h headers. As a result, the compiler cannot know the
-return type of the function at compile time, and will implicitly
-convert to a pointer. This has implications on 64-bit systems.
-This patch sets the deprecation mode on, so that the function prototype
-gets included when compiling.
-(Description by Fabian Fagerholm <fabbe@debian.org>)
-
-diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c
---- trunk~/saslauthd/lak.c	2006-06-04 12:26:20.000000000 +0300
-+++ trunk/saslauthd/lak.c	2008-02-15 14:32:11.000000000 +0200
-@@ -55,6 +55,7 @@
- #include <openssl/des.h>
- #endif
- 
-+#define LDAP_DEPRECATED 1
- #include <ldap.h>
- #include <lber.h>
- #include <sasl.h>
diff --git a/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch b/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch
deleted file mode 100644
index a49b553f0..000000000
--- a/testing/cyrus-sasl/0022_gcc4.4_preprocessor_syntax.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-0022_gcc4.4_preprocessor_syntax.dpatch by  <fabbe@paniq.net>
-
-The #elif preprocessor directive requires a test condition.
-GCC 4.4 enforces this rule.
-
-diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c
---- trunk~/plugins/digestmd5.c	2006-06-04 12:26:19.000000000 +0300
-+++ trunk/plugins/digestmd5.c	2009-01-26 13:29:40.000000000 +0200
-@@ -2715,7 +2715,7 @@
- 	"DIGEST-MD5",			/* mech_name */
- #ifdef WITH_RC4
- 	128,				/* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 	112,
- #else 
- 	1,
-@@ -4034,7 +4034,7 @@
- 	"DIGEST-MD5",
- #ifdef WITH_RC4				/* mech_name */
- 	128,				/* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 	112,
- #else
- 	1,
diff --git a/testing/cyrus-sasl/0025_ld_as_needed.patch b/testing/cyrus-sasl/0025_ld_as_needed.patch
deleted file mode 100644
index 67b48b4a4..000000000
--- a/testing/cyrus-sasl/0025_ld_as_needed.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Matthias Klose <doko@ubuntu.com>
-Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
-it.
---- a/saslauthd/Makefile.am
-+++ b/saslauthd/Makefile.am
-@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c
- saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
- saslauthd_LDADD	= @SASL_KRB_LIB@ \
- 		  @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
--		  @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
-+		  @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
- 
- testsaslauthd_SOURCES = testsaslauthd.c utils.c
- testsaslauthd_LDADD = @LIB_SOCKET@
---- a/sasldb/Makefile.am
-+++ b/sasldb/Makefile.am
-@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a
- 
- libsasldb_la_SOURCES = allockey.c sasldb.h
- EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
--libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
--libsasldb_la_LIBADD = $(SASL_DB_BACKEND) 
-+libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
-+libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
- 
- # Prevent make dist stupidity
- libsasldb_a_SOURCES =
diff --git a/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch b/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch
deleted file mode 100644
index cc00867ef..000000000
--- a/testing/cyrus-sasl/0026_drop_krb5support_dependency.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Roberto C. Sanchez <roberto@connexer.com>
-Description: Drop gratuitous dependency on krb5support
---- a/cmulocal/sasl2.m4
-+++ b/cmulocal/sasl2.m4
-@@ -112,9 +112,6 @@ if test "$gssapi" != no; then
-   fi
- 
-   if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
--    # check for libkrb5support first
--    AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
--
-     gss_failed=0
-     AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
-                  ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
diff --git a/testing/cyrus-sasl/0027_db5_support.patch b/testing/cyrus-sasl/0027_db5_support.patch
deleted file mode 100644
index 522824074..000000000
--- a/testing/cyrus-sasl/0027_db5_support.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Ondřej Surý <ondrej@debian.org>
-Description: Support newer Berkeley DB versions
---- a/sasldb/db_berkeley.c
-+++ b/sasldb/db_berkeley.c
-@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
---- a/utils/dbconverter-2.c
-+++ b/utils/dbconverter-2.c
-@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch b/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch
deleted file mode 100644
index 14a322496..000000000
--- a/testing/cyrus-sasl/0030-dont_use_la_files_for_opening_plugins.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- a/lib/dlopen.c
-+++ b/lib/dlopen.c
-@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi
-     return result;
- }
- 
--/* this returns the file to actually open.
-- *  out should be a buffer of size PATH_MAX
-- *  and may be the same as in. */
--
--/* We'll use a static buffer for speed unless someone complains */
--#define MAX_LINE 2048
--
--static int _parse_la(const char *prefix, const char *in, char *out) 
--{
--    FILE *file;
--    size_t length;
--    char line[MAX_LINE];
--    char *ntmp = NULL;
--
--    if(!in || !out || !prefix || out == in) return SASL_BADPARAM;
--
--    /* Set this so we can detect failure */
--    *out = '\0';
--
--    length = strlen(in);
--
--    if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) {
--	if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) {
--	    /* check for a .la file */
--	    strcpy(line, prefix);
--	    strcat(line, in);
--	    length = strlen(line);
--	    *(line + (length - strlen(SO_SUFFIX))) = '\0';
--	    strcat(line, LA_SUFFIX);
--	    file = fopen(line, "r");
--	    if(file) {
--		/* We'll get it on the .la open */
--		fclose(file);
--		return SASL_FAIL;
--	    }
--	}
--	strcpy(out, prefix);
--	strcat(out, in);
--	return SASL_OK;
--    }
--
--    strcpy(line, prefix);
--    strcat(line, in);
--
--    file = fopen(line, "r");
--    if(!file) {
--	_sasl_log(NULL, SASL_LOG_WARN,
--		  "unable to open LA file: %s", line);
--	return SASL_FAIL;
--    }
--    
--    while(!feof(file)) {
--	if(!fgets(line, MAX_LINE, file)) break;
--	if(line[strlen(line) - 1] != '\n') {
--	    _sasl_log(NULL, SASL_LOG_WARN,
--		      "LA file has too long of a line: %s", in);
--	    return SASL_BUFOVER;
--	}
--	if(line[0] == '\n' || line[0] == '#') continue;
--	if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) {
--	    /* We found the line with the name in it */
--	    char *end;
--	    char *start;
--	    size_t len;
--	    end = strrchr(line, '\'');
--	    if(!end) continue;
--	    start = &line[sizeof("dlname=")-1];
--	    len = strlen(start);
--	    if(len > 3 && start[0] == '\'') {
--		ntmp=&start[1];
--		*end='\0';
--		/* Do we have dlname="" ? */
--		if(ntmp == end) {
--		    _sasl_log(NULL, SASL_LOG_DEBUG,
--			      "dlname is empty in .la file: %s", in);
--		    return SASL_FAIL;
--		}
--		strcpy(out, prefix);
--		strcat(out, ntmp);
--	    }
--	    break;
--	}
--    }
--    if(ferror(file) || feof(file)) {
--	_sasl_log(NULL, SASL_LOG_WARN,
--		  "Error reading .la: %s\n", in);
--	fclose(file);
--	return SASL_FAIL;
--    }
--    fclose(file);
--
--    if(!(*out)) {
--	_sasl_log(NULL, SASL_LOG_WARN,
--		  "Could not find a dlname line in .la file: %s", in);
--	return SASL_FAIL;
--    }
--
--    return SASL_OK;
--}
- #endif /* DO_DLOPEN */
- 
- /* loads a plugin library */
-@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_
- 		if (length + pos>=PATH_MAX) continue; /* too big */
- 
- 		if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)),
--			   SO_SUFFIX)
--		    && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)),
--			   LA_SUFFIX))
-+			   SO_SUFFIX))
- 		    continue;
- 
-+		/* We only use .so files for loading plugins */
-+
- 		memcpy(name,dir->d_name,length);
- 		name[length]='\0';
- 
--		result = _parse_la(prefix, name, tmp);
--		if(result != SASL_OK)
--		    continue;
--		
-+		/* Create full name with path */
-+		strncpy(tmp, prefix, PATH_MAX);
-+		strncat(tmp, name, PATH_MAX);
-+
- 		/* skip "lib" and cut off suffix --
- 		   this only need be approximate */
- 		strcpy(plugname, name + 3);
diff --git a/testing/cyrus-sasl/PKGBUILD b/testing/cyrus-sasl/PKGBUILD
deleted file mode 100644
index b54f8c797..000000000
--- a/testing/cyrus-sasl/PKGBUILD
+++ /dev/null
@@ -1,202 +0,0 @@
-# $Id: PKGBUILD 139621 2011-10-03 19:56:54Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-# This package spans multiple repositories. 
-# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
-
-pkgbase=('cyrus-sasl')
-pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
-#pkgname=libsasl
-pkgver=2.1.23
-pkgrel=8
-pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
-arch=('i686' 'x86_64')
-url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
-license=('custom')
-options=('!makeflags' '!libtool')
-makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
-source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
-        cyrus-sasl-2.1.19-checkpw.c.patch
-        cyrus-sasl-2.1.22-crypt.patch
-        cyrus-sasl-2.1.22-qa.patch
-        cyrus-sasl-2.1.22-automake-1.10.patch
-        cyrus-sasl-2.1.23-authd-fix.patch
-        0003_saslauthd_mdoc.patch
-        0010_maintainer_mode.patch
-        0011_saslauthd_ac_prog_libtool.patch
-        0012_xopen_crypt_prototype.patch
-        0016_pid_file_lock_creation_mask.patch
-        0018_auth_rimap_quotes.patch
-        0019_ldap_deprecated.patch
-        0022_gcc4.4_preprocessor_syntax.patch
-        0025_ld_as_needed.patch
-        0026_drop_krb5support_dependency.patch
-        0027_db5_support.patch
-        0030-dont_use_la_files_for_opening_plugins.patch
-        saslauthd.conf.d
-        saslauthd)
-md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
-         'e27ddff076342e7a3041c4759817d04b'
-         'd7e6886e88af04d05f3dec7f0a59ccf7'
-         '79b8a5e8689989e2afd4b7bda595a7b1'
-         'f4131b077ddb5240b375d749162f1b7a'
-         'c7ad2c70c1ef814eb4b119f316c064f2'
-         'caeeac3feba19cbbd36e7345cc805600'
-         'f45d8b60e8f74dd7f7c2ec1665fa602a'
-         '9d93880514cb5ff5da969f1ceb64a661'
-         'dfdc052a7e678db9f687482c5d52f34e'
-         '4a09f6b24b91f8450892a78e378860da'
-         '213abe7c5dfe0d7f446992787da1e780'
-         '5a0321177ad30cb5518c8b6812e3961a'
-         '0c965748970eea29fa295524821d43f0'
-         '62bf892fe4d1df41ff748e91a1afaf67'
-         'b7848957357e7c02d6490102be496bf9'
-         'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
-         '8e7106f32e495e9ade69014fd1b3352a'
-         '49219af5641150edec288a3fdb65e7c1'
-         '75542f613185d5a90520ad0d7d926a20')
-
-build() {
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch"
-  patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch"
-  patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch"
-  patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch"
-  patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch"
-  patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch"
-  patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch"
-  patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch"
-  patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch"
-  patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch"
-  patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch"
-  patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch"
-  patch -Np1 -i "${srcdir}/0027_db5_support.patch"
-  patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch"
-
-  rm -f config/config.guess config/config.sub 
-  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
-  rm -fr autom4te.cache
-  libtoolize -c
-  aclocal -I config -I cmulocal
-  automake -a -c
-  autoheader
-  autoconf
-
-  pushd saslauthd
-  rm -f config/config.guess config/config.sub 
-  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
-  rm -fr autom4te.cache
-  libtoolize -c
-  aclocal -I config -I ../cmulocal -I ../config
-  automake -a -c
-  autoheader
-  autoconf
-  popd
-
-  ./configure --prefix=/usr \
-      --mandir=/usr/share/man \
-      --infodir=/usr/share/info \
-      --disable-static \
-      --enable-shared \
-      --enable-alwaystrue \
-      --enable-checkapop \
-      --enable-cram \
-      --enable-digest \
-      --disable-otp \
-      --disable-srp \
-      --disable-srp-setpass \
-      --disable-krb4 \
-      --enable-gssapi \
-      --enable-auth-sasldb \
-      --enable-plain \
-      --enable-anon \
-      --enable-login \
-      --enable-ntlm \
-      --disable-passdss \
-      --enable-sql \
-      --enable-ldapdb \
-      --disable-macos-framework \
-      --with-pam \
-      --with-saslauthd=/var/run/saslauthd \
-      --with-ldap \
-      --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
-      --sysconfdir=/etc \
-      --with-devrandom=/dev/urandom
-  make
-}
-
-package_libsasl() {
-  pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library"
-  depends=('openssl')
-  conflicts=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
-  for dir in include lib sasldb plugins utils; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-  rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so*
-  rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so*
-  rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so*
-  install -m755 -d "${pkgdir}/usr/share/licenses/libsasl"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/"
-}
-
-package_cyrus-sasl() {
-  depends=("libsasl=${pkgver}-${pkgrel}")
-  pkgdesc="Cyrus saslauthd SASL authentication daemon"
-  backup=('etc/conf.d/saslauthd')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 -d "${pkgdir}/etc/conf.d"
-  install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/"
-  install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/"
-}
-
-package_cyrus-sasl-gssapi() {
-  pkgdesc="GSSAPI authentication mechanism for Cyrus SASL"
-  depends=("libsasl=${pkgver}-${pkgrel}" 'krb5')
-  replaces=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
-  install -m755 -d "${pkgdir}/usr/lib/sasl2"
-  cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/"
-}
-
-package_cyrus-sasl-ldap() {
-  pkgdesc="ldapdb auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}-${pkgrel}" 'libldap')
-  replaces=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
-  install -m755 -d "${pkgdir}/usr/lib/sasl2"
-  cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/"
-}
-
-package_cyrus-sasl-sql() {
-  pkgdesc="SQL auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmysqlclient')
-  replaces=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
-  install -m755 -d "${pkgdir}/usr/lib/sasl2"
-  cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/"
-}
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch
deleted file mode 100644
index f7bf44b79..000000000
--- a/testing/cyrus-sasl/cyrus-sasl-2.1.19-checkpw.c.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in
---- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in	2004-07-02 21:40:15.000000000 +0200
-+++ ./lib/Makefile.in	2004-09-07 13:21:22.746680576 +0200
-@@ -120,7 +120,7 @@
- JAVA_TRUE = @JAVA_TRUE@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = -lcrypt @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_CRYPT = @LIB_CRYPT@
- LIB_DES = @LIB_DES@
-diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c
---- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c	2004-03-17 14:58:13.000000000 +0100
-+++ ./lib/checkpw.c	2004-09-07 13:21:12.645916147 +0200
-@@ -94,6 +94,23 @@
- # endif
- #endif
- 
-+/******************************
-+ * crypt(3) patch start       *
-+ ******************************/
-+char *crypt(const char *key, const char *salt);
-+
-+/* cleartext password formats */
-+#define PASSWORD_FORMAT_CLEARTEXT 1
-+#define PASSWORD_FORMAT_CRYPT 2
-+#define PASSWORD_FORMAT_CRYPTTRAD 3
-+#define PASSWORD_SALT_BUF_LEN 22
-+
-+/* weeds out crypt(3) password's salt */
-+int _sasl_get_salt (char *dest, char *src, int format);
-+
-+/******************************
-+ * crypt(3) patch stop        *
-+ ******************************/
- 
- /* we store the following secret to check plaintext passwords:
-  *
-@@ -143,7 +160,51 @@
- 				       "*cmusaslsecretPLAIN",
- 				       NULL };
-     struct propval auxprop_values[3];
--    
-+
-+	/******************************
-+	 * crypt(3) patch start       *
-+	 * for password format check  *
-+	 ******************************/
-+    sasl_getopt_t *getopt;
-+    void *context;
-+    const char *p = NULL;
-+	/**
-+	 * MD5: 12 char salt
-+	 * BLOWFISH: 16 char salt
-+	 */
-+	char salt[PASSWORD_SALT_BUF_LEN];
-+	int password_format;
-+
-+	/* get password format from auxprop configuration */
-+	if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) {
-+		getopt(context, NULL, "password_format", &p, NULL);
-+	}
-+
-+	/* set password format */
-+	if (p) {
-+		/*
-+		memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN);
-+		strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1));
-+		*/
-+		/* modern, modular crypt(3) */
-+		if (strncmp(p, "crypt", 11) == 0)
-+			password_format = PASSWORD_FORMAT_CRYPT;
-+		/* traditional crypt(3) */
-+		else if (strncmp(p, "crypt_trad", 11) == 0)
-+			password_format = PASSWORD_FORMAT_CRYPTTRAD;
-+		/* cleartext password */
-+		else
-+			password_format = PASSWORD_FORMAT_CLEARTEXT;
-+	} else {
-+		/* cleartext password */
-+		password_format = PASSWORD_FORMAT_CLEARTEXT;
-+	}
-+
-+	/******************************
-+	 * crypt(3) patch stop        *
-+	 * for password format check  *
-+	 ******************************/
-+
-     if (!conn || !userstr)
- 	return SASL_BADPARAM;
- 
-@@ -180,14 +241,31 @@
- 	goto done;
-     }
- 
--    /* At the point this has been called, the username has been canonified
--     * and we've done the auxprop lookup.  This should be easy. */
--    if(auxprop_values[0].name
--       && auxprop_values[0].values
--       && auxprop_values[0].values[0]
--       && !strcmp(auxprop_values[0].values[0], passwd)) {
--	/* We have a plaintext version and it matched! */
--	return SASL_OK;
-+
-+	/******************************
-+	 * crypt(3) patch start       *
-+	 ******************************/	
-+
-+	/* get salt */
-+	_sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format);
-+	
-+	/* crypt(3)-ed password? */
-+	if (password_format != PASSWORD_FORMAT_CLEARTEXT) {
-+		/* compare password */
-+		if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0)
-+			return SASL_OK;
-+		else
-+			ret = SASL_BADAUTH;
-+	}
-+	else if (password_format == PASSWORD_FORMAT_CLEARTEXT) {
-+		/* compare passwords */
-+		if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0)
-+			return SASL_OK;
-+		else
-+			ret = SASL_BADAUTH;
-+	/******************************
-+	 * crypt(3) patch stop        *
-+	 ******************************/
-     } else if(auxprop_values[1].name
- 	      && auxprop_values[1].values
- 	      && auxprop_values[1].values[0]) {
-@@ -975,3 +1053,37 @@
- #endif     
-     { NULL, NULL }
- };
-+
-+/* weeds out crypt(3) password's salt */
-+int _sasl_get_salt (char *dest, char *src, int format) {
-+	int num;	/* how many characters is salt long? */
-+	switch (format) {
-+		case PASSWORD_FORMAT_CRYPT:
-+			/* md5 crypt */
-+			if (src[1] == '1')
-+				num = 12;
-+			/* blowfish crypt */
-+			else if (src[1] == '2')
-+				num = (src[1] == '2' && src[2] == 'a') ? 17 : 16;
-+			/* traditional crypt */
-+			else
-+				num = 2;
-+			break;
-+	
-+		case PASSWORD_FORMAT_CRYPTTRAD:
-+			num = 2;
-+			break;
-+
-+		default:
-+			return 1;
-+	}
-+
-+	/* destroy destination */
-+	memset(dest, '\0', (num + 1));
-+
-+	/* copy salt to destination */
-+	strncpy(dest, src, num);
-+
-+	return 1;
-+}
-+
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch
deleted file mode 100644
index 1294cb507..000000000
--- a/testing/cyrus-sasl/cyrus-sasl-2.1.22-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- saslauthd/configure.in.orig	2006-05-23 15:53:17.000000000 -0700
-+++ saslauthd/configure.in	2006-05-23 15:53:33.000000000 -0700
-@@ -77,7 +77,7 @@
-   AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
-   SASL_DB_PATH_CHECK()
-   SASL_DB_CHECK()
--  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
-+  SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB"
- fi
- 
- AC_ARG_ENABLE(httpform, [  --enable-httpform       enable HTTP form authentication [[no]] ],
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch
deleted file mode 100644
index 8cd71c0c5..000000000
--- a/testing/cyrus-sasl/cyrus-sasl-2.1.22-automake-1.10.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Re-merged patch by Robert Scheck <redhat@linuxnetz.de> for cyrus-sasl >= 2.1.22, which was
-originally written by Jacek Konieczny <jajcus@pld-linux.org> and makes cyrus-sasl building
-using automake 1.10.
-
---- cyrus-sasl-2.1.22/plugins/Makefile.am		2006-05-17 18:46:16.000000000 +0200
-+++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110		2007-02-16 15:42:07.000000000 +0100
-@@ -82,73 +82,73 @@
- 	libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
- 
- libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
--libplain_la_LDFLAGS = -version-info $(plain_version)
-+libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version)
- libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
- libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
- 
- libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources)
--libanonymous_la_LDFLAGS = -version-info $(anonymous_version)
-+libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version)
- libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS)
- libanonymous_la_LIBADD = $(COMPAT_OBJS)
- 
- libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources)
--libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version)
-+libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version)
- libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS)
- libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS)
- 
- libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources)
--libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version)
-+libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version)
- libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS)
- libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS)
- 
- libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources)
--libcrammd5_la_LDFLAGS = -version-info $(crammd5_version)
-+libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version)
- libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS)
- libcrammd5_la_LIBADD = $(COMPAT_OBJS)
- 
- libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources)
--libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version)
-+libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version)
- libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS)
- libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS)
- 
- liblogin_la_SOURCES = login.c login_init.c $(common_sources)
--liblogin_la_LDFLAGS = -version-info $(login_version)
-+liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version)
- liblogin_la_DEPENDENCIES = $(COMPAT_OBJS)
- liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
- 
- libsrp_la_SOURCES = srp.c srp_init.c $(common_sources)
--libsrp_la_LDFLAGS = -version-info $(srp_version)
-+libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version)
- libsrp_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS)
- 
- libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources)
--libotp_la_LDFLAGS = -version-info $(otp_version)
-+libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version)
- libotp_la_DEPENDENCIES = $(COMPAT_OBJS)
- libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS)
- 
- libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources)
--libntlm_la_LDFLAGS = -version-info $(ntlm_version)
-+libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version)
- libntlm_la_DEPENDENCIES = $(COMPAT_OBJS)
- libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS)
- 
- libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources)
--libpassdss_la_LDFLAGS = -version-info $(passdss_version)
-+libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version)
- libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS)
- libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS)
- 
- # Auxprop Plugins
- libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
--libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
-+libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version)
- libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
- 
- libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources)
--libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version)
-+libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version)
- libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
- libldapdb_la_LIBADD = $(COMPAT_OBJS)
- 
- libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
--libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
-+libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
- libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsql_la_LIBADD = $(COMPAT_OBJS)
- 
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch
deleted file mode 100644
index fd356327b..000000000
--- a/testing/cyrus-sasl/cyrus-sasl-2.1.22-crypt.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-http://bugs.gentoo.org/152544
-
---- cyrus-sasl-2.1.22/lib/Makefile.am
-+++ cyrus-sasl-2.1.22/lib/Makefile.am
-@@ -45,6 +45,7 @@ sasl_version = 2:22:0
- 
- INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
- 
-+AM_CFLAGS = -fPIC
- EXTRA_DIST = windlopen.c staticopen.h NTMakefile
- EXTRA_LIBRARIES = libsasl2.a
- noinst_LIBRARIES = @SASL_STATIC_LIBS@
---- cyrus-sasl-2.1.22/plugins/Makefile.am
-+++ cyrus-sasl-2.1.22/plugins/Makefile.am
-@@ -63,6 +63,7 @@ srp_version = 2:22:0
- 
- INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
- AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
-+AM_CFLAGS = -fPIC
- 
- COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
- 
---- cyrus-sasl-2.1.22/sasldb/Makefile.am
-+++ cyrus-sasl-2.1.22/sasldb/Makefile.am
-@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
- 
- extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
- 
-+AM_CFLAGS = -fPIC
- EXTRA_DIST = NTMakefile
- 
- noinst_LTLIBRARIES = libsasldb.la
---- cyrus-sasl-2.1.22/utils/Makefile.am
-+++ cyrus-sasl-2.1.22/utils/Makefile.am
-@@ -42,7 +42,7 @@
- #
- ################################################################
- 
--all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET)
-+all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT)
- all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
- 
- sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer
---- cyrus-sasl-2.1.22/sample/Makefile.am
-+++ cyrus-sasl-2.1.22/sample/Makefile.am
-@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c
- server_SOURCES = server.c common.c common.h
- client_SOURCES = client.c common.c common.h
- 
--server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
--client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
-+server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
-+client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
- 
--sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
--sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
-+sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
-+sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
- 
- EXTRA_DIST = NTMakefile
---- cyrus-sasl-2.1.22/lib/Makefile.am
-+++ cyrus-sasl-2.1.22/lib/Makefile.am
-@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la
- libsasl2_la_SOURCES = $(common_sources) $(common_headers)
- libsasl2_la_LDFLAGS = -version-info $(sasl_version)
- libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
--libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
-+libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT)
- 
- if MACOSX
- framedir = /Library/Frameworks/SASL2.framework
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch
deleted file mode 100644
index 4f7b04f13..000000000
--- a/testing/cyrus-sasl/cyrus-sasl-2.1.22-qa.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix missing prototype warnings
-
---- cyrus-sasl-2.1.22/lib/auxprop.c
-+++ cyrus-sasl-2.1.22/lib/auxprop.c
-@@ -43,6 +43,7 @@
-  */
- 
- #include <config.h>
-+#include <stdio.h>
- #include <sasl.h>
- #include <prop.h>
- #include <ctype.h>
---- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
-+++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
-@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF
- ******************************************************************/
- 
- #include <shadow.h>
-+#include <string.h>
- 
- extern char *crypt();
- 
diff --git a/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch b/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch
deleted file mode 100644
index f5f372d17..000000000
--- a/testing/cyrus-sasl/cyrus-sasl-2.1.23-authd-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-fix warnings:
-
-auth_sasldb.c: In function ‘auth_sasldb’:
-auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’
-
-auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type
-../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’
-
---- saslauthd/auth_sasldb.c
-+++ saslauthd/auth_sasldb.c
-@@ -41,6 +41,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <pwd.h>
-+#include <unistd.h>
- /* END PUBLIC DEPENDENCIES */
- 
- #define RETURN(x) return strdup(x)
-@@ -131,7 +132,8 @@
-     /* VARIABLES */
-     char pw[1024];			/* pointer to passwd file entry */
-     sasl_utils_t utils;
--    int ret, outsize;
-+    int ret;
-+    size_t outsize;
-     const char *use_realm;
-     char realm_buf[MAXHOSTNAMELEN];
-     /* END VARIABLES */
diff --git a/testing/cyrus-sasl/saslauthd b/testing/cyrus-sasl/saslauthd
deleted file mode 100644
index 6afafae0b..000000000
--- a/testing/cyrus-sasl/saslauthd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME="saslauthd"
-SASLAUTHD_BIN=/usr/sbin/saslauthd
-SASLAUTHD_RUN=/var/run/saslauthd
-SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid
-
-case "$1" in
-  start)
-    stat_busy "Starting $DAEMON_NAME"
-    [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd
-    if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then
-      add_daemon $DAEMON_NAME
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $DAEMON_NAME"
-    [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm_daemon $DAEMON_NAME
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-# vim: ts=2 sw=2 et ft=sh
diff --git a/testing/cyrus-sasl/saslauthd.conf.d b/testing/cyrus-sasl/saslauthd.conf.d
deleted file mode 100644
index 167211290..000000000
--- a/testing/cyrus-sasl/saslauthd.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-SASLAUTHD_OPTS="-a pam"
diff --git a/testing/db/PKGBUILD b/testing/db/PKGBUILD
deleted file mode 100644
index 0e5efe384..000000000
--- a/testing/db/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 138357 2011-09-20 16:16:07Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=db
-pkgver=5.2.36
-pkgrel=1
-pkgdesc="The Berkeley DB embedded database system"
-arch=('i686' 'x86_64')
-url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
-license=('custom')
-depends=('gcc-libs' 'sh')
-options=('!libtool')
-install=db.install
-source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz)
-sha1sums=('1a7997e5bcdf504a439f90d9eaed63864806ed5f')
-
-build() {
-  cd "${srcdir}/$pkgname-${pkgver}/build_unix"
-  ../dist/configure --prefix=/usr --enable-compat185 \
-    --enable-shared --enable-static --enable-cxx --enable-dbm
-  make LIBSO_LIBS=-lpthread
-}
-
-package() {
-  cd "${srcdir}/$pkgname-${pkgver}/build_unix"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/docs
-  install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE \
-    "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/db/db.install b/testing/db/db.install
deleted file mode 100644
index 03b64042d..000000000
--- a/testing/db/db.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 5.1)" -lt 0 ]; then
-    echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases."
-  fi
-}
diff --git a/testing/dbus-core/PKGBUILD b/testing/dbus-core/PKGBUILD
deleted file mode 100644
index 8efdd024f..000000000
--- a/testing/dbus-core/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 139666 2011-10-04 16:34:12Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-#
-pkgname=dbus-core
-pkgver=1.4.16
-pkgrel=1
-pkgdesc="Freedesktop.org message bus system"
-url="http://www.freedesktop.org/Software/dbus"
-arch=(i686 x86_64)
-license=('GPL' 'custom')
-depends=('expat>=2.0.1' 'coreutils' 'filesystem')
-makedepends=('libx11')
-conflicts=('dbus<1.2.3-2')
-options=(!libtool)
-install=dbus.install
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz
-        dbus)
-md5sums=('44a2a10678e7e50460879c3eb4453a65'
-         '08f93dd19cffd1b45ab05c1fd4efb560')
-
-build() {
-  cd "${srcdir}/dbus-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
-      --with-system-pid-file=/var/run/dbus.pid \
-      --enable-inotify --disable-dnotify \
-      --disable-verbose-mode --disable-static \
-      --disable-tests --disable-asserts \
-      --with-systemdsystemunitdir=/lib/systemd/system
-  make
-}
-
-package(){
-  cd "${srcdir}/dbus-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}/usr/bin/dbus-launch"
-  rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1"
-
-  chown 81:81 "${pkgdir}/var/run/dbus"
-
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/"
-
-  #Fix configuration file
-  sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf"
-
-  #install .keep files so pacman doesn't delete empty dirs
-  touch "${pkgdir}/usr/share/dbus-1/services/.keep"
-  touch "${pkgdir}/usr/share/dbus-1/system-services/.keep"
-  touch "${pkgdir}/etc/dbus-1/session.d/.keep"
-  touch "${pkgdir}/etc/dbus-1/system.d/.keep"
-
-  install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/"
-}
diff --git a/testing/dbus-core/dbus b/testing/dbus-core/dbus
deleted file mode 100644
index 66b84cae0..000000000
--- a/testing/dbus-core/dbus
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-    start)
-        stat_busy "Starting D-BUS system messagebus"
-	if [ ! -x /var/run/dbus ] ; then
-	    install -m755 -g 81 -o 81 -d /var/run/dbus
-	fi
-        if [ -x /usr/bin/dbus-uuidgen ] ; then
-            /usr/bin/dbus-uuidgen --ensure
-        fi
-
-        /usr/bin/dbus-daemon --system
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon dbus
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping D-BUS system messagebus"
-	[ -f /var/run/dbus.pid ] && kill `cat /var/run/dbus.pid` >/dev/null 2>&1
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-	    rm -f /var/run/dbus.pid
-            rm_daemon dbus
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    reload)
-        stat_busy "Reloading D-BUS configuration"
-        [ -f /var/run/dbus.pid ] && /usr/bin/dbus-send \
-                --system --type=method_call \
-                --dest=org.freedesktop.DBus \
-                / org.freedesktop.DBus.ReloadConfig
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            stat_done
-        fi
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart|reload}"
-	;;
-esac
-exit 0
diff --git a/testing/dbus-core/dbus.install b/testing/dbus-core/dbus.install
deleted file mode 100644
index 44f4475ee..000000000
--- a/testing/dbus-core/dbus.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  getent group dbus >/dev/null || usr/sbin/groupadd -g 81 dbus
-  getent passwd dbus >/dev/null || usr/sbin/useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
-  usr/bin/passwd -l dbus &>/dev/null
-  dbus-uuidgen --ensure
-}
-
-post_upgrade() {
-  post_install
-
-  #Make sure new rc script can shutdown running dbus
-  if [ -f var/run/dbus/pid ]; then
-    mv var/run/dbus/pid var/run/dbus.pid
-  fi
-}
-
-post_remove() {
-  if getent passwd dbus >/dev/null; then
-    usr/sbin/userdel dbus
-  fi
-  if getent group dbus >/dev/null; then
-    usr/sbin/groupdel dbus
-  fi
-}
diff --git a/testing/dbus-glib/PKGBUILD b/testing/dbus-glib/PKGBUILD
deleted file mode 100644
index 1ac8c7f38..000000000
--- a/testing/dbus-glib/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 139670 2011-10-04 16:57:18Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=dbus-glib
-pkgver=0.98
-pkgrel=1
-pkgdesc="GLib bindings for DBUS"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.freedesktop.org/wiki/Software/DBusBindings"
-depends=('dbus-core' 'glib2')
-makedepends=('pkgconfig')
-options=('!libtool' '!emptydirs')
-source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3f7f117dc7c8d899d9acfdcbf9253fb8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --enable-static=no --enable-bash-completion=no
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/dbus/30-dbus b/testing/dbus/30-dbus
deleted file mode 100644
index 603e92d3e..000000000
--- a/testing/dbus/30-dbus
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# launches a session dbus instance
-
-dbuslaunch="`which dbus-launch 2>/dev/null`"
-if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-  eval `$dbuslaunch --sh-syntax --exit-with-session`
-fi
-
diff --git a/testing/dbus/PKGBUILD b/testing/dbus/PKGBUILD
deleted file mode 100644
index c113e634a..000000000
--- a/testing/dbus/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 139668 2011-10-04 16:52:58Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-#
-pkgname=dbus
-pkgver=1.4.16
-pkgrel=1
-pkgdesc="Freedesktop.org message bus system"
-url="http://www.freedesktop.org/Software/dbus"
-arch=(i686 x86_64)
-license=('GPL' 'custom')
-depends=("dbus-core>=${pkgver}" 'libx11')
-source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        30-dbus)
-md5sums=('44a2a10678e7e50460879c3eb4453a65'
-         'd14e59575f04e55d21a04907b6fd9f3c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ECHO="echo" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
-      --with-system-pid-file=/var/run/dbus.pid \
-      --disable-verbose-mode --disable-static \
-      --enable-inotify --disable-dnotify \
-      --disable-tests --disable-asserts
-  make -C tools dbus-launch
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/bin"
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m755 tools/dbus-launch "${pkgdir}/usr/bin/"
-  install -m644 doc/dbus-launch.1 "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/etc/X11/xinit/xinitrc.d"
-  install -m755 "${srcdir}/30-dbus" "${pkgdir}/etc/X11/xinit/xinitrc.d/"
-
-  install -d -m755 "${pkgdir}/usr/share/licenses/dbus"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus/"
-}
diff --git a/testing/dconf/PKGBUILD b/testing/dconf/PKGBUILD
deleted file mode 100644
index daff10f60..000000000
--- a/testing/dconf/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 138862 2011-09-28 19:29:26Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=dconf
-pkgver=0.10.0
-pkgrel=1
-pkgdesc="A low-level configuration system."
-arch=(i686 x86_64)
-url="http://live.gnome.org/dconf"
-license=('LGPL2.1')
-depends=('glib2')
-makedepends=('vala' 'gobject-introspection' 'gtk3')
-optdepends=('gtk3: for dconf-editor')
-install=dconf.install
-source=(http://download.gnome.org/sources/${pkgname}/0.10/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('9f744ccfb3da20163a4bb27916c960f6bf56048b3ec1112862c85414fc064ee2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/dconf
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/dconf/dconf.install b/testing/dconf/dconf.install
deleted file mode 100644
index 39bce8f45..000000000
--- a/testing/dconf/dconf.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    usr/bin/gio-querymodules usr/lib/gio/modules
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade(){
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/devhelp/PKGBUILD b/testing/devhelp/PKGBUILD
deleted file mode 100644
index 774dae515..000000000
--- a/testing/devhelp/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 138864 2011-09-28 19:29:28Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=devhelp
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="API documentation browser for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://live.gnome.org/devhelp/"
-depends=('gconf' 'libwebkit3' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'python2')
-options=('!libtool' '!emptydirs')
-install=devhelp.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('974b4418036fa9a63a8f275257ed9ec1b7cae61a97e8e001e56e460c8a8e310e')
-
-build() {
-  cd "${srcdir}/devhelp-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/devhelp-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain devhelp ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/devhelp/devhelp.install b/testing/devhelp/devhelp.install
deleted file mode 100644
index 4db5f6e5c..000000000
--- a/testing/devhelp/devhelp.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=devhelp
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD
deleted file mode 100644
index e07745b6b..000000000
--- a/testing/empathy/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 138866 2011-09-28 19:29:30Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=empathy
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="A GNOME instant messaging client using the Telepathy framework."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Empathy"
-license=('GPL2')
-depends=('libpulse' 'clutter-gtk' 'clutter-gst' 'telepathy-mission-control' 'telepathy-logger' 'telepathy-farsight' 'telepathy-farstream' 'folks' 'gnome-keyring' 'libcanberra' 'iso-codes' 'networkmanager')
-makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto')
-optdepends=('telepathy-gabble: XMPP/Jabber support'
-            'telepathy-butterfly: MSN support'
-            'telepathy-idle: IRC support'
-            'telepathy-salut: Link-local XMPP support'
-            'telepathy-sofiasip: SIP support'
-            'telepathy-haze: libpurple support')
-options=('!libtool')
-groups=('gnome-extra')
-install=empathy.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('0c55d8603ab2f1a4e998dc06bf8a6e48bdb6b02e373ac0d009b3f218fdec9633')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc  \
-      --libexecdir=/usr/lib/empathy \
-      --disable-static \
-      --disable-scrollkeeper \
-      --disable-schemas-compile
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/empathy/empathy.install b/testing/empathy/empathy.install
deleted file mode 100644
index c3f7abf13..000000000
--- a/testing/empathy/empathy.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-    echo "To use Empathy you need to install at least one Telepathy connection manager."
-}
-
-post_upgrade() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/enblend-enfuse/PKGBUILD b/testing/enblend-enfuse/PKGBUILD
deleted file mode 100644
index 1d8ec216c..000000000
--- a/testing/enblend-enfuse/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 138156 2011-09-17 21:02:44Z stephane $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Dominik Ryba <domryba@post.pl>
-
-pkgname=enblend-enfuse
-pkgver=4.0
-pkgrel=3
-pkgdesc="intelligent blend tool for overlapping picture"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://enblend.sourceforge.net"
-depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'libgl' 'lcms' 'texinfo' 'libpng')
-makedepends=('boost' 'pkgconfig')
-replaces=('enblend')
-conflicts=('enblend')
-provides=('enblend')
-install=${pkgname}.install
-source=(http://downloads.sourceforge.net/sourceforge/enblend/${pkgname}-${pkgver}.tar.gz libpng-1.4.patch)
-md5sums=('2e7c950061e0085fd75d94576130250f' 'a39df8dd32ccfa020dea2ea388642575')
-sha1sums=('34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033' 'eae6cf48ea082865130302d0b4d1ca0b884a563b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
-  patch -Np1 -i ../libpng-1.4.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info"
-  install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info"
-}
diff --git a/testing/enblend-enfuse/enblend-enfuse.install b/testing/enblend-enfuse/enblend-enfuse.install
deleted file mode 100644
index 0ba358878..000000000
--- a/testing/enblend-enfuse/enblend-enfuse.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(enblend.info enfuse-focus-stacking.info enfuse.info)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/enblend-enfuse/libpng-1.4.patch b/testing/enblend-enfuse/libpng-1.4.patch
deleted file mode 100644
index 3bf852b58..000000000
--- a/testing/enblend-enfuse/libpng-1.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx
---- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx	2010-01-19 22:09:36.000000000 -0500
-+++ enblend-enfuse-3.2/src/vigra_impex/png.cxx	2010-01-19 22:13:43.000000000 -0500
-@@ -275,8 +275,8 @@
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
-             if (setjmp(png->jmpbuf))
--                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
--            png_set_gray_1_2_4_to_8(png);
-+                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+            png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-         }
- 
diff --git a/testing/eog-plugins/PKGBUILD b/testing/eog-plugins/PKGBUILD
deleted file mode 100644
index 9e506027c..000000000
--- a/testing/eog-plugins/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 138870 2011-09-28 19:29:33Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=eog-plugins
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Plugins for Eye of Gnome"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org/"
-license=('GPL2')
-depends=('eog' 'libpeas' 'libchamplain' 'libexif' 'libgdata')
-makedepends=('intltool')
-install=eog-plugins.install
-options=('!libtool')
-groups=(gnome-extra)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('49a78e862a1967733b439ca4a4cde42084e8d4b1947c4a5ddb1b3581bec64dc0')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/eog-plugins/eog-plugins.install b/testing/eog-plugins/eog-plugins.install
deleted file mode 100644
index 24072f316..000000000
--- a/testing/eog-plugins/eog-plugins.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/eog/PKGBUILD b/testing/eog/PKGBUILD
deleted file mode 100644
index 2139f1383..000000000
--- a/testing/eog/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 138868 2011-09-28 19:29:31Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=eog
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Eye of Gnome: An image viewing and cataloging program"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf')
-makedepends=('gtk-doc' 'intltool')
-install=eog.install
-groups=('gnome-extra')
-options=('!emptydirs' '!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('79184d0cf420d4b8c1d1de92c30f1d95afc7cd686876e07b20cb82a2ec20d8e3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # remove it from Xfce menu that ships its own thingy
-  echo "NotShowIn=XFCE" >> ${pkgdir}/usr/share/applications/eog.desktop
-}
diff --git a/testing/eog/eog.install b/testing/eog/eog.install
deleted file mode 100644
index 284b24b18..000000000
--- a/testing/eog/eog.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall eog
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/epiphany/PKGBUILD b/testing/epiphany/PKGBUILD
deleted file mode 100644
index 0107648a1..000000000
--- a/testing/epiphany/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 138872 2011-09-28 19:29:35Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=epiphany
-pkgver=3.2.0
-pkgrel=1
-install=epiphany.install
-pkgdesc="A GNOME web browser based on the WebKit rendering engine."
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
-         'hicolor-icon-theme' 'seed')
-makedepends=('intltool' 'gnome-doc-utils' 'startup-notification')
-options=('!libtool' '!emptydirs')
-groups=('gnome')
-url="http://www.gnome.org/projects/epiphany/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-       fix_crash::http://git.gnome.org/browse/epiphany/patch/?id=1cb7fb1109aecedd224d03fda202165adf3423a7)
-sha256sums=('e5402cb8b52d3de5c09feb01bbf28a1bd3c20f260a2e0956c9d132f41040e5d2'
-            'ef1423bfaea72c44bd1bc1cc49d06e98dab89235fab2ad5dcd89d87b4d62cb4f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix_crash"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-scrollkeeper \
-      --enable-seed
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/epiphany/epiphany.install b/testing/epiphany/epiphany.install
deleted file mode 100644
index 00b1abb96..000000000
--- a/testing/epiphany/epiphany.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/epiphany.schemas ]; then
-    usr/sbin/gconfpkg --uninstall epiphany
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/evince/PKGBUILD b/testing/evince/PKGBUILD
deleted file mode 100644
index 3cb6d2c4b..000000000
--- a/testing/evince/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 138874 2011-09-28 19:29:37Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evince
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Simply a document viewer"
-url="http://projects.gnome.org/evince/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme'
-         't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
-makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection')
-optdepends=('texlive-bin: DVI support')
-groups=('gnome-extra')
-install=evince.install
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('a9bc17e7f99489354cc66ffede68466ea0a9c52664b18198291c3a40d0150235')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr   --sysconfdir=/etc \
-      --localstatedir=/var    --libexecdir=/usr/lib/evince \
-      --disable-static        --enable-nautilus \
-      --enable-pdf            --enable-tiff \
-      --enable-djvu           --enable-dvi \
-      --enable-t1lib          --enable-comics \
-      --disable-scrollkeeper  --disable-schemas-compile \
-      --enable-introspection
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/evince/evince.install b/testing/evince/evince.install
deleted file mode 100644
index 9643a9ba0..000000000
--- a/testing/evince/evince.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall evince
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/evolution-data-server/PKGBUILD b/testing/evolution-data-server/PKGBUILD
deleted file mode 100644
index 4f1f2d86e..000000000
--- a/testing/evolution-data-server/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 138878 2011-09-28 19:29:41Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-data-server
-pkgver=3.2.0
-pkgrel=2
-pkgdesc="Centralized access to appointments and contacts"
-arch=('i686' 'x86_64')
-depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
-makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala')
-options=('!libtool')
-url="http://www.gnome.org"
-license=('GPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('de2a75e5256143ed7eb273a78a45ff2ba8af81c894dbf17c5dade5be349fc427')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --with-openldap=yes \
-      --libexecdir=/usr/lib/evolution-data-server \
-      --with-krb5=/usr --with-libdb=/usr \
-      --enable-vala-bindings
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/evolution-exchange/PKGBUILD b/testing/evolution-exchange/PKGBUILD
deleted file mode 100644
index f23512299..000000000
--- a/testing/evolution-exchange/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 138880 2011-09-28 19:29:43Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-exchange
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Ximian Connector Exchange plugin for Evolution"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.ximian.com"
-depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
-makedepends=('intltool' 'evolution')
-options=('!libtool' '!emptydirs')
-install=evolution-exchange.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('f61a5e5e5a51a6bc45c0df20d7a99a8c5361fac07eb9eadc15dd5329af1f1f29')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/evolution --disable-static \
-      --with-libdb=/usr --with-krb5=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-exchange-3.2 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/evolution-exchange/evolution-exchange.install b/testing/evolution-exchange/evolution-exchange.install
deleted file mode 100644
index 1179887f9..000000000
--- a/testing/evolution-exchange/evolution-exchange.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=evolution-exchange
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/evolution/PKGBUILD b/testing/evolution/PKGBUILD
deleted file mode 100644
index b26e57872..000000000
--- a/testing/evolution/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 138876 2011-09-28 19:29:39Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Manage your email, contacts and schedule"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils' 'networkmanager')
-optdepends=('bogofilter: possible junk filter plugin'
-            'spamassassin: possible junk filter plugin')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-install=evolution.install
-url=http://www.gnome.org/projects/evolution/
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('538883531aa64bec1b43c73db9cf1b59573d10adc4d8dca6401e4bffa90f246d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib \
-      --disable-scrollkeeper \
-      --enable-nss=yes \
-      --with-openldap=yes \
-      --enable-smime=yes \
-      --with-krb5=/usr \
-      --disable-image-inline
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-  make
-  make -C plugins/tnef-attachments
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  make -C plugins/tnef-attachments DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-3.2 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/evolution/evolution.install b/testing/evolution/evolution.install
deleted file mode 100644
index a2c3aaa54..000000000
--- a/testing/evolution/evolution.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=evolution
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/fakeroot/PKGBUILD b/testing/fakeroot/PKGBUILD
deleted file mode 100644
index 2e84ce9c0..000000000
--- a/testing/fakeroot/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 139541 2011-10-03 12:19:54Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Jochem Kossen <j.kossen@home.nl>
-
-pkgname=fakeroot
-pkgver=1.18.1
-pkgrel=1
-pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://packages.debian.org/fakeroot"
-groups=('base-devel')
-install=fakeroot.install
-depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh')
-options=('!libtool')
-source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2)
-md5sums=('8eedda3dcb71b6ab6f62297b82ae5ac6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \
-              --disable-static --with-ipc=sysv
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
-
-  install -dm755 ${pkgdir}/etc/ld.so.conf.d/
-  echo '/usr/lib/libfakeroot' > ${pkgdir}/etc/ld.so.conf.d/fakeroot.conf
-
-  # install README for sysv/tcp usage
-  install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README
-}
diff --git a/testing/fakeroot/fakeroot.install b/testing/fakeroot/fakeroot.install
deleted file mode 100644
index 986c91b06..000000000
--- a/testing/fakeroot/fakeroot.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  sbin/ldconfig -r .
-}
-
-post_upgrade() {
-  if [ "$(vercmp $2 1.14.4-2)" -lt 0 ]; then
-    sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf
-  fi
-  sbin/ldconfig -r .
-}
-
-pre_remove() {
-  sbin/ldconfig -r .
-}
diff --git a/testing/ffmpeg/PKGBUILD b/testing/ffmpeg/PKGBUILD
deleted file mode 100644
index 2b4de898e..000000000
--- a/testing/ffmpeg/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 139579 2011-10-03 14:22:30Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=ffmpeg
-pkgver=20111003
-pkgrel=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
-arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
-license=('GPL')
-depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg' 'rtmpdump')
-makedepends=('yasm' 'git')
-#git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz)
-md5sums=('38139817bee918a5664c549adb487468')
-
-build() {
-  cd "$srcdir/$pkgname"
-
-  ./configure \
-    --prefix=/usr \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-librtmp \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug
-
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-}
-
-package() {
-  cd "$srcdir/$pkgname"
-  make DESTDIR="$pkgdir" install install-man
-  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/folks/PKGBUILD b/testing/folks/PKGBUILD
deleted file mode 100644
index f4147f882..000000000
--- a/testing/folks/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 138884 2011-09-28 19:29:47Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=folks
-pkgver=0.6.3.2
-pkgrel=1
-pkgdesc="Library to aggregates people into metacontacts"
-arch=(i686 x86_64)
-url="http://telepathy.freedesktop.org/wiki/Folks"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb')
-makedepends=('gobject-introspection' 'vala' 'intltool')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.6/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e04d80e4bab12d85a254a22a6b5b8fab88d14d1c2f7b732e40299960c7c32414')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/fwbuilder/PKGBUILD b/testing/fwbuilder/PKGBUILD
deleted file mode 100644
index b0e0eb0c8..000000000
--- a/testing/fwbuilder/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 139139 2011-09-30 09:12:13Z eric $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=fwbuilder
-pkgver=5.0.0.3568
-pkgrel=2
-pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms"
-url="http://www.fwbuilder.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libxslt' 'net-snmp' 'qt')
-conflicts=('libfwbuilder')
-install=fwbuilder.install
-source=("http://sourceforge.net/projects/fwbuilder/files/Current_Packages/5.0.0/fwbuilder-${pkgver}.tar.gz")
-md5sums=('0324edab10329dde029953d646aa8dad')
-
-build() {
-  cd "${srcdir}/fwbuilder-${pkgver}"
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/fwbuilder-${pkgver}"
-  make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/testing/fwbuilder/fwbuilder.install b/testing/fwbuilder/fwbuilder.install
deleted file mode 100644
index 45f0c2242..000000000
--- a/testing/fwbuilder/fwbuilder.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
-
diff --git a/testing/gcalctool/PKGBUILD b/testing/gcalctool/PKGBUILD
deleted file mode 100644
index c1b355595..000000000
--- a/testing/gcalctool/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 138886 2011-09-28 19:29:49Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gcalctool
-pkgver=6.2.0
-pkgrel=1
-pkgdesc="GNOME Scientific calculator"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils')
-groups=('gnome-extra')
-options=(!emptydirs)
-url="http://www.gnome.org"
-install=gcalctool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('ddc2efe25220e9341832304dfd9e5e2390a70bb6bd70d1afeb49da88023cdffb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gcalctool/gcalctool.install b/testing/gcalctool/gcalctool.install
deleted file mode 100644
index 2ef26aaa9..000000000
--- a/testing/gcalctool/gcalctool.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/gconf/01_xml-gettext-domain.patch b/testing/gconf/01_xml-gettext-domain.patch
deleted file mode 100644
index d1323f61f..000000000
--- a/testing/gconf/01_xml-gettext-domain.patch
+++ /dev/null
@@ -1,362 +0,0 @@
-# Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks.
-# Ubuntu: https://bugs.launchpad.net/bugs/123025
-# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845
---- GConf-2.26.0/backends/markup-tree.c.gettext	2009-04-26 23:33:05.258484987 -0400
-+++ GConf-2.26.0/backends/markup-tree.c	2009-04-26 23:34:25.026700526 -0400
-@@ -52,6 +52,7 @@ struct _MarkupEntry
-   char       *schema_name;
-   char       *mod_user;
-   GTime       mod_time;
-+  const char *gettext_domain;
- };
- 
- static LocalSchemaInfo* local_schema_info_new  (void);
-@@ -1593,6 +1594,8 @@ markup_entry_set_value (MarkupEntry     
-                              gconf_schema_get_type (schema));
-       gconf_schema_set_owner (current_schema,
-                               gconf_schema_get_owner (schema));
-+      gconf_schema_set_gettext_domain (current_schema,
-+                              gconf_schema_get_gettext_domain (schema));
-     }
- 
-   /* Update mod time */
-@@ -1805,6 +1808,8 @@ markup_entry_get_value (MarkupEntry *ent
-       else if (c_local_schema && c_local_schema->long_desc)
-         gconf_schema_set_long_desc (schema, c_local_schema->long_desc);
- 
-+      gconf_schema_set_gettext_domain (schema, entry->gettext_domain);
-+
-       return retval;
-     }
- }
-@@ -2339,8 +2344,9 @@ parse_value_element (GMarkupParseContext
-   const char *ltype;
-   const char *list_type;
-   const char *owner;
-+
-   GConfValueType vtype;
--  const char *dummy1, *dummy2, *dummy3, *dummy4;
-+  const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5;
-   
- #if 0
-   g_assert (ELEMENT_IS ("entry") ||
-@@ -2377,6 +2383,7 @@ parse_value_element (GMarkupParseContext
-                           "muser", &dummy2,
-                           "mtime", &dummy3,
-                           "schema", &dummy4,
-+                          "gettext_domain", &dummy5,
- 
-                           NULL))
-     return;
-@@ -2683,6 +2690,7 @@ parse_entry_element (GMarkupParseContext
-       const char *mtime;
-       const char *schema;
-       const char *type;
-+      const char *gettext_domain;
-       const char *dummy1, *dummy2, *dummy3, *dummy4;
-       const char *dummy5, *dummy6, *dummy7;
-       GConfValue *value;
-@@ -2693,6 +2701,7 @@ parse_entry_element (GMarkupParseContext
-       mtime = NULL;
-       schema = NULL;
-       type = NULL;
-+      gettext_domain = NULL;
- 
-       if (!locate_attributes (context, element_name, attribute_names, attribute_values,
-                               error,
-@@ -2701,6 +2710,7 @@ parse_entry_element (GMarkupParseContext
-                               "mtime", &mtime,
-                               "schema", &schema,
-                               "type", &type,
-+                              "gettext_domain", &gettext_domain,
-                           
-                               /* These are allowed but we don't use them until
-                                * parse_value_element
-@@ -2768,6 +2778,9 @@ parse_entry_element (GMarkupParseContext
-        */
-       if (schema)
-         entry->schema_name = g_strdup (schema);
-+
-+      if (gettext_domain)
-+        entry->gettext_domain = g_intern_string (gettext_domain);
-     }
-   else
-     {
-@@ -3716,6 +3729,7 @@ write_value_element (GConfValue *value,
-         GConfSchema *schema;
-         GConfValueType stype;
-         const char *owner;
-+        const char *gettext_domain;
-         
-         schema = gconf_value_get_schema (value);
- 
-@@ -3741,6 +3755,23 @@ write_value_element (GConfValue *value,
-             
-             g_free (s);
-           }
-+
-+        gettext_domain = gconf_schema_get_gettext_domain (schema);
-+        
-+        if (gettext_domain)
-+          {
-+            char *s;
-+
-+            s = g_markup_escape_text (gettext_domain, -1);
-+            
-+            if (fprintf (f, " gettext_domain=\"%s\"", s) < 0)
-+              {
-+                g_free (s);
-+                return FALSE;
-+              }
-+            
-+            g_free (s);
-+          }
-         
-         if (stype == GCONF_VALUE_LIST)
-           {
-diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd
---- GConf-2.26.0/doc/gconf-1.0.dtd.gettext	2009-04-26 23:33:17.240736103 -0400
-+++ GConf-2.26.0/doc/gconf-1.0.dtd	2009-04-26 23:34:25.027700384 -0400
-@@ -7,7 +7,7 @@
- <!-- A single schema. What I am trying to say is "this set of
- elements, in any order". Duplicate elements (apart from <locale>) are
- not allowed). -->
--<!ELEMENT schema  (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*)*>
-+<!ELEMENT schema  (key|applyto*|owner?|type|(list_type|(car_type,cdr_type))?|default?|locale*|gettext_domain?)*>
- 
- <!-- The key for this schema (e.g. /schemas/apps/foo/bar) -->
- <!ELEMENT key     (#PCDATA)>
-diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c
---- GConf-2.26.0/gconf/gconf-internals.c.gettext	2009-04-26 23:34:10.994700035 -0400
-+++ GConf-2.26.0/gconf/gconf-internals.c	2009-04-26 23:34:53.767450191 -0400
-@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem
-   cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : "");
-   cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : "");
-   cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : "");
-+  cs->gettext_domain = CORBA_string_dup (gconf_schema_get_gettext_domain (sc) ? gconf_schema_get_gettext_domain (sc) : "");
- 
-   {
-     gchar* encoded;
-@@ -600,6 +601,14 @@ gconf_schema_from_corba_schema(const Con
-         gconf_schema_set_owner(sc, cs->owner);
-     }
-       
-+  if (*cs->gettext_domain != '\0')
-+    {
-+      if (!g_utf8_validate (cs->gettext_domain, -1, NULL))
-+        gconf_log (GCL_ERR, _("Invalid UTF-8 in gettext domain for schema"));
-+      else
-+        gconf_schema_set_gettext_domain(sc, cs->gettext_domain);
-+    }
-+      
-   {
-     GConfValue* val;
- 
-diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c
---- GConf-2.26.0/gconf/gconf-schema.c.gettext	2009-04-26 23:33:26.787483545 -0400
-+++ GConf-2.26.0/gconf/gconf-schema.c	2009-04-26 23:35:54.240450142 -0400
-@@ -32,9 +32,10 @@ typedef struct {
-   GConfValueType car_type; /* Pair car type of the described entry */
-   GConfValueType cdr_type; /* Pair cdr type of the described entry */
-   gchar* locale;       /* Schema locale */
--  gchar* owner;        /* Name of creating application */
-+  const gchar* owner;        /* Name of creating application */
-   gchar* short_desc;   /* 40 char or less description, no newlines */
-   gchar* long_desc;    /* could be a paragraph or so */
-+  const gchar* gettext_domain; /* description gettext domain */
-   GConfValue* default_value; /* Default value of the key */
- } GConfRealSchema;
- 
-@@ -63,7 +64,6 @@ gconf_schema_free (GConfSchema* sc)
-   g_free (real->locale);
-   g_free (real->short_desc);
-   g_free (real->long_desc);
--  g_free (real->owner);
- 
-   if (real->default_value)
-     gconf_value_free (real->default_value);
-@@ -91,7 +91,9 @@ gconf_schema_copy (const GConfSchema* sc
- 
-   dest->long_desc = g_strdup (real->long_desc);
- 
--  dest->owner = g_strdup (real->owner);
-+  dest->gettext_domain = real->gettext_domain;
-+
-+  dest->owner = real->owner;
- 
-   dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL;
-   
-@@ -136,6 +138,17 @@ gconf_schema_set_locale (GConfSchema* sc
-     REAL_SCHEMA (sc)->locale = NULL;
- }
- 
-+void
-+gconf_schema_set_gettext_domain (GConfSchema* sc, const gchar* domain)
-+{
-+  g_return_if_fail (domain == NULL || g_utf8_validate (domain, -1, NULL));
-+  
-+  if (domain)
-+    REAL_SCHEMA (sc)->gettext_domain = g_intern_string (domain);
-+  else 
-+    REAL_SCHEMA (sc)->gettext_domain = NULL;
-+}
-+
- void          
- gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc)
- {
-@@ -169,11 +182,8 @@ gconf_schema_set_owner (GConfSchema* sc,
- {
-   g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL));
-   
--  if (REAL_SCHEMA (sc)->owner)
--    g_free (REAL_SCHEMA (sc)->owner);
--
-   if (owner)
--    REAL_SCHEMA (sc)->owner = g_strdup (owner);
-+    REAL_SCHEMA (sc)->owner = g_intern_string (owner);
-   else
-     REAL_SCHEMA (sc)->owner = NULL;
- }
-@@ -228,6 +238,14 @@ gconf_schema_validate (const GConfSchema
-       return FALSE;
-     }
- 
-+  if (real->gettext_domain && !g_utf8_validate (real->gettext_domain, -1, NULL))
-+    {
-+      g_set_error (err, GCONF_ERROR,
-+                   GCONF_ERROR_FAILED,
-+                   _("Schema contains invalid UTF-8"));
-+      return FALSE;
-+    }
-+
-   if (real->owner && !g_utf8_validate (real->owner, -1, NULL))
-     {
-       g_set_error (err, GCONF_ERROR,
-@@ -299,11 +317,32 @@ gconf_schema_get_locale (const GConfSche
- }
- 
- const char*
-+gconf_schema_get_gettext_domain (const GConfSchema *schema)
-+{
-+  g_return_val_if_fail (schema != NULL, NULL);
-+
-+  return REAL_SCHEMA (schema)->gettext_domain;
-+}
-+
-+static inline const char *
-+schema_translate (const GConfSchema *schema,
-+                  const char        *string)
-+{
-+  if (REAL_SCHEMA (schema)->gettext_domain)
-+    {
-+      bind_textdomain_codeset (REAL_SCHEMA (schema)->gettext_domain, "UTF-8");
-+      return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, string);
-+    }
-+  else
-+    return string;
-+}
-+
-+const char*
- gconf_schema_get_short_desc (const GConfSchema *schema)
- {
-   g_return_val_if_fail (schema != NULL, NULL);
- 
--  return REAL_SCHEMA (schema)->short_desc;
-+ return schema_translate (schema, REAL_SCHEMA (schema)->short_desc);
- }
- 
- const char*
-@@ -311,7 +350,7 @@ gconf_schema_get_long_desc (const GConfS
- {
-   g_return_val_if_fail (schema != NULL, NULL);
- 
--  return REAL_SCHEMA (schema)->long_desc;
-+ return schema_translate (schema, REAL_SCHEMA (schema)->long_desc);
- }
- 
- const char*
-diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h
---- GConf-2.26.0/gconf/gconf-schema.h.gettext	2009-04-26 23:33:33.979744088 -0400
-+++ GConf-2.26.0/gconf/gconf-schema.h	2009-04-26 23:34:25.030737043 -0400
-@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type          
-                                             GConfValueType  type);
- void gconf_schema_set_locale               (GConfSchema    *sc,
-                                             const gchar    *locale);
-+void gconf_schema_set_gettext_domain       (GConfSchema    *sc,
-+                                            const gchar    *domain);
- void gconf_schema_set_short_desc           (GConfSchema    *sc,
-                                             const gchar    *desc);
- void gconf_schema_set_long_desc            (GConfSchema    *sc,
-@@ -65,6 +67,7 @@ GConfValueType gconf_schema_get_list_typ
- GConfValueType gconf_schema_get_car_type      (const GConfSchema *schema);
- GConfValueType gconf_schema_get_cdr_type      (const GConfSchema *schema);
- const char*    gconf_schema_get_locale        (const GConfSchema *schema);
-+const char*    gconf_schema_get_gettext_domain(const GConfSchema *schema);
- const char*    gconf_schema_get_short_desc    (const GConfSchema *schema);
- const char*    gconf_schema_get_long_desc     (const GConfSchema *schema);
- const char*    gconf_schema_get_owner         (const GConfSchema *schema);
-diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c
---- GConf-2.26.0/gconf/gconftool.c.gettext	2009-04-26 23:33:41.907451190 -0400
-+++ GConf-2.26.0/gconf/gconftool.c	2009-04-26 23:34:25.034736752 -0400
-@@ -3295,6 +3295,7 @@ struct _SchemaInfo {
-   GConfValueType cdr_type;
-   GConfValue* global_default;
-   GHashTable* hash;
-+  gchar* gettext_domain;
- };
- 
- static int
-@@ -3547,6 +3548,15 @@ extract_global_info(xmlNodePtr node,
-               else
-                 g_printerr (_("WARNING: empty <applyto> node"));
-             }
-+          else if (strcmp((char *)iter->name, "gettext_domain") == 0)
-+            {
-+              tmp = (char *)xmlNodeGetContent(iter);
-+              if (tmp)
-+                {
-+                  info->gettext_domain = g_strdup(tmp);
-+                  xmlFree(tmp);
-+                }
-+            }
-           else
-             g_printerr (_("WARNING: node <%s> not understood below <schema>\n"),
- 			iter->name);
-@@ -3636,6 +3646,9 @@ process_locale_info(xmlNodePtr node, Sch
-   if (info->owner != NULL)
-     gconf_schema_set_owner(schema, info->owner);
- 
-+  if (info->gettext_domain != NULL)
-+    gconf_schema_set_gettext_domain(schema, info->gettext_domain);
-+
-   xmlFree(name);
- 
-   /* Locale-specific info */
-@@ -3765,6 +3778,7 @@ get_schema_from_xml(xmlNodePtr node, gch
-   info.apply_to = NULL;
-   info.owner = NULL;
-   info.global_default = NULL;
-+  info.gettext_domain = NULL;
-   info.hash = g_hash_table_new(g_str_hash, g_str_equal);
-   
-   extract_global_info(node, &info);
-@@ -3801,6 +3815,8 @@ get_schema_from_xml(xmlNodePtr node, gch
-             ;  /* nothing */
-           else if (strcmp((char *)iter->name, "applyto") == 0)
-             ;  /* nothing */
-+          else if (strcmp((char *)iter->name, "gettext_domain") == 0)
-+            ;  /* nothing */
-           else if (strcmp((char *)iter->name, "locale") == 0)
-             {
-               process_locale_info(iter, &info);
-diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl
---- GConf-2.26.0/gconf/GConfX.idl.gettext	2009-04-26 23:33:58.457483190 -0400
-+++ GConf-2.26.0/gconf/GConfX.idl	2009-04-26 23:34:53.764448732 -0400
-@@ -16,6 +16,7 @@ struct ConfigSchema {
-   string short_desc;
-   string long_desc;
-   string owner;
-+  string gettext_domain;
-   // Work around lack of recursive data types
-   string encoded_default_value;
- };
diff --git a/testing/gconf/PKGBUILD b/testing/gconf/PKGBUILD
deleted file mode 100644
index 512a7d57f..000000000
--- a/testing/gconf/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 138888 2011-09-28 19:29:53Z ibiru $
-# Maintainer:  Jan de Groot <jan@archlinux.org>
-
-pkgname=gconf
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="A configuration database system"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('libxml2' 'polkit' 'libldap' 'dbus-glib' 'gtk3')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
-options=('!libtool')
-install=gconf.install
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-${pkgver}.tar.xz
-        gconf-merge-schema
-        gconfpkg
-        gconf-reload.patch
-        01_xml-gettext-domain.patch)
-sha256sums=('f371745529d7ed209b0b222f33f5996231cc153e901aea3ce0ad0a46b5a96d0b'
-            'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028'
-            'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898'
-            '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
-            'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8')
-
-build() {
-  cd "${srcdir}/GConf-${pkgver}"
-  # Patch from fedora - reloads gconf after installing schemas
-  patch -Np1 -i "${srcdir}/gconf-reload.patch"
-  # http://bugzilla.gnome.org/show_bug.cgi?id=568845
-  patch -Np1 -i "${srcdir}/01_xml-gettext-domain.patch"
-
-  # Python2 fix
-  sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/GConf \
-      --disable-static --enable-defaults-service --with-gtk=3.0 \
-      --disable-orbit
-
-  make pkglibdir=/usr/lib/GConf
-}
-
-package() {
-  cd "${srcdir}/GConf-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/gconf/gconf.xml.system"
-  install -m755 "${srcdir}/gconf-merge-schema" "${pkgdir}/usr/bin/"
-  install -Dm755 "${srcdir}/gconfpkg" "${pkgdir}/usr/sbin/gconfpkg"
-}
diff --git a/testing/gconf/gconf-merge-schema b/testing/gconf/gconf-merge-schema
deleted file mode 100755
index 992c162e6..000000000
--- a/testing/gconf/gconf-merge-schema
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-if [ ! "$1" -a ! "$2" ]; then
-  echo "Usage: $0 output.schemas [--domain gettextdomain] file1.schemas [file2.schemas [...]]"
-  exit 1
-fi
-
-OUTFILE="$1"
-DOMAIN=""
-shift
-
-if [ "$1" = "--domain" ]; then
-  shift
-  DOMAIN=$1
-  shift
-fi
-
-echo '<?xml version="1.0"?>' > "$OUTFILE"
-echo '<gconfschemafile><schemalist>' >> "$OUTFILE"
-
-while [ "$1" ]; do
-  if [ -f "$1" ]; then
-    sed -e '/<?xml/d' \
-        -e 's|<gconfschemafile>||g' \
-	-e 's|</gconfschemafile>||g' \
-        -e 's|<schemalist>||g' \
-	-e 's|</schemalist>||g' "$1" >> "$OUTFILE"
-  fi
-  shift
-done
-  
-echo '</schemalist></gconfschemafile>' >> "$OUTFILE"
-if [ "$DOMAIN" != "" ]; then
-  sed -ri "s/^([[:space:]]*)(<locale name=\"C\">)/\1<gettext_domain>$DOMAIN<\/gettext_domain>\n\1\2/; /^[[:space:]]*<locale name=\"[^C]/,/^[[:space:]]*<\/locale>[[:space:]]*\$/ d; /^$/d; s/<\/schema>$/&\n/" "$OUTFILE"
-fi
diff --git a/testing/gconf/gconf-reload.patch b/testing/gconf/gconf-reload.patch
deleted file mode 100644
index 910f0dae4..000000000
--- a/testing/gconf/gconf-reload.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- GConf-2.16.0/gconf/gconftool.c.orig	2006-10-14 17:37:14.000000000 +0000
-+++ GConf-2.16.0/gconf/gconftool.c	2006-10-14 17:39:27.000000000 +0000
-@@ -963,6 +963,8 @@ main (int argc, char** argv)
-       
-       gconf_engine_unref (conf);
- 
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
-+
-       return retval;
-     }
- 
-@@ -975,6 +977,8 @@ main (int argc, char** argv)
-       
-       gconf_engine_unref (conf);
- 
-+      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
-+
-       return retval;
-     }
- 
diff --git a/testing/gconf/gconf.install b/testing/gconf/gconf.install
deleted file mode 100644
index f7945d165..000000000
--- a/testing/gconf/gconf.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  ldconfig -r .
-  chmod 755 etc/gconf/gconf.xml.system
-  usr/bin/gio-querymodules usr/lib/gio/modules
-}
-
-post_upgrade() {
-  ldconfig -r .
-  chmod 755 etc/gconf/gconf.xml.system
-  usr/bin/gio-querymodules usr/lib/gio/modules
-
-  PID=`pidof gconfd-2`
-  if [ ! -z "${PID}" ]; then
-    kill ${PID}
-  fi
-}
-
-post_remove() {
-    usr/bin/gio-querymodules usr/lib/gio/modules
-}
diff --git a/testing/gconf/gconfpkg b/testing/gconf/gconfpkg
deleted file mode 100755
index 72021e45e..000000000
--- a/testing/gconf/gconfpkg
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-usage() {
-cat << _EOF
-Usage:
-  gconfpkg [OPTION] [PACKAGE] 
-
-  Help Options:
-    -?, --help            Show help options
-
-  Application Options:
-    --install             Install schemas for a given package
-    --uninstall           Uninstall schemas for a given package
-
-_EOF
-}
-
-install() {
-  GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-      /usr/bin/gconftool-2 --makefile-install-rule /usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
-}
-
-uninstall() {
-  if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=/usr/share/gconf/schemas/${pkgname}.schemas
-  elif [ -f /opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=/opt/gnome/share/gconf/schemas/${pkgname}.schemas
-  else
-    schemas=`pacman -Ql ${pkgname} | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`
-  fi
-  GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-      /usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas} >/dev/null
-}
-
-if [ -z "$2" ]; then
-  usage
-else
-  pkgname="$2"
-  case "$1" in
-    --install)
-      install
-    ;;
-    --uninstall)
-      uninstall
-    ;;
-    *)
-    usage
-    ;;
-  esac
-fi
diff --git a/testing/gdl/PKGBUILD b/testing/gdl/PKGBUILD
deleted file mode 100644
index 5193d349e..000000000
--- a/testing/gdl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 138890 2011-09-28 19:29:56Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gdl
-pkgver=3.1.5
-pkgrel=1
-pkgdesc="GNOME Docking Library"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.gnome.org/"
-depends=('gtk3')
-makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b89a30a7df499f3ee74108bb28ac46a962dc5e94c4e50fe34c8f9cf1580db482')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD
deleted file mode 100644
index 238978cf8..000000000
--- a/testing/gdm/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 138892 2011-09-28 19:30:00Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-pkgname=gdm
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Gnome Display Manager (a reimplementation of xdm)"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-backup=('etc/pam.d/gdm-autologin' 'etc/pam.d/gdm-fingerprint' 'etc/pam.d/gdm' 'etc/pam.d/gdm-password'
-        'etc/pam.d/gdm-smartcard' 'etc/pam.d/gdm-welcome' 'etc/gdm/custom.conf')
-groups=('gnome-extra')
-options=('!libtool')
-depends=('libcanberra' 'libxklavier' 'gnome-session' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss')
-makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection')
-optdepends=('gnome-shell: new login interface')
-install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-        fix_external_program_directories.patch
-        gdm-vt-allocation-hack.patch
-        gdm
-        gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam)
-sha256sums=('f827f5500827acef94ad2d60f02ec489bc35cb6392d8f4a60ec814599c2991b7'
-            '55654861b14fea344bc7a43fa265c9aaffcd16f5cf56360483fff5d4dc83cf15'
-            '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215'
-            '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550'
-            'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d'
-            '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e'
-            'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19'
-            '0dbb37b4e2a2a2dd2305f0f69cf32d63d353d34aacaf805d2c2ec52fbe558bb4'
-            'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd'
-            '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix_external_program_directories.patch"
-  patch -Np1 -i "${srcdir}/gdm-vt-allocation-hack.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gdm \
-      --localstatedir=/var \
-      --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
-      --disable-scrollkeeper \
-      --disable-static \
-      --without-tcp-wrappers
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gdm ${pkgdir}/etc/gconf/schemas/*.schemas
-
-  for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam;do
-      install -m644 "${srcdir}/${i}" "${pkgdir}/etc/pam.d/${i%.pam}"
-  done
-
-  install -Dm755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/gdm"
-
-  chmod 1770 "${pkgdir}/var/log/gdm"
-  chmod 700 "${pkgdir}/var/lib/gdm/.config/dconf"
-  rm -rf "${pkgdir}/var/run" "${pkgdir}/var/gdm" "${pkgdir}/etc/gconf"
-}
diff --git a/testing/gdm/fix_external_program_directories.patch b/testing/gdm/fix_external_program_directories.patch
deleted file mode 100644
index b74530dd2..000000000
--- a/testing/gdm/fix_external_program_directories.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Nur gdm-3.1.91.orig/daemon/gdm-server.c gdm-3.1.91/daemon/gdm-server.c
---- gdm-3.1.91.orig/daemon/gdm-server.c	2011-09-09 21:58:06.586838200 +0000
-+++ gdm-3.1.91/daemon/gdm-server.c	2011-09-09 21:58:14.583578916 +0000
-@@ -131,7 +131,7 @@
-         g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
- 
-         error = NULL;
--        command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
-+        command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s",
-                                    server->priv->display_name);
- 
-         g_debug ("GdmServer: Running helper %s", command);
-diff -Nur gdm-3.1.91.orig/data/gdm-shell.session.in gdm-3.1.91/data/gdm-shell.session.in
---- gdm-3.1.91.orig/data/gdm-shell.session.in	2011-09-09 21:58:06.613505113 +0000
-+++ gdm-3.1.91/data/gdm-shell.session.in	2011-09-09 21:59:00.300668930 +0000
-@@ -1,5 +1,5 @@
- [GNOME Session]
- Name=Display Manager
- RequiredComponents=gnome-shell;gnome-settings-daemon;
--IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
-+IsRunnableHelper=/usr/lib/gnome-session/gnome-session-check-accelerated
- FallbackSession=gdm-fallback
-diff -Nur gdm-3.1.91.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.1.91/gui/simple-chooser/gdm-chooser-session.c
---- gdm-3.1.91.orig/gui/simple-chooser/gdm-chooser-session.c	2011-09-09 21:58:06.613505113 +0000
-+++ gdm-3.1.91/gui/simple-chooser/gdm-chooser-session.c	2011-09-09 21:58:14.583578916 +0000
-@@ -131,7 +131,7 @@
-         ret = FALSE;
- 
-         error = NULL;
--        g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error);
-+        g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon", &error);
-         if (error != NULL) {
-                 g_warning ("Error starting settings daemon: %s", error->message);
-                 g_error_free (error);
diff --git a/testing/gdm/gdm b/testing/gdm/gdm
deleted file mode 100755
index c3e635a6d..000000000
--- a/testing/gdm/gdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting GDM"
-    /usr/sbin/gdm &
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      
-      add_daemon gdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping GDM"
-    [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon gdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/gdm/gdm-autologin.pam b/testing/gdm/gdm-autologin.pam
deleted file mode 100644
index c77c78917..000000000
--- a/testing/gdm/gdm-autologin.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_permit.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
diff --git a/testing/gdm/gdm-fingerprint.pam b/testing/gdm/gdm-fingerprint.pam
deleted file mode 100644
index 5b74bf6d6..000000000
--- a/testing/gdm/gdm-fingerprint.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_fprintd.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
diff --git a/testing/gdm/gdm-password.pam b/testing/gdm/gdm-password.pam
deleted file mode 100644
index 7beda835a..000000000
--- a/testing/gdm/gdm-password.pam
+++ /dev/null
@@ -1,20 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_unix.so nullok
-auth            optional        pam_gnome_keyring.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_unix.so
-
-password        required        pam_unix.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_gnome_keyring.so auto_start
diff --git a/testing/gdm/gdm-smartcard.pam b/testing/gdm/gdm-smartcard.pam
deleted file mode 100644
index baacb8bed..000000000
--- a/testing/gdm/gdm-smartcard.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_pkcs11.so wait_for_card card_only
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_unix.so
-
-password        required        pam_pkcs11.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
diff --git a/testing/gdm/gdm-vt-allocation-hack.patch b/testing/gdm/gdm-vt-allocation-hack.patch
deleted file mode 100644
index 56fa5a151..000000000
--- a/testing/gdm/gdm-vt-allocation-hack.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
-index 39def47..03488fd 100644
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
-@@ -33,6 +33,8 @@
- #include <grp.h>
- #include <signal.h>
- #include <sys/resource.h>
-+#include <sys/ioctl.h>
-+#include <sys/vt.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
-         return out;
- }
- 
-+#ifndef O_NOCTTY
-+# define O_NOCTTY 0
-+#endif
-+
-+static int
-+open_vt (int vtno)
-+{
-+	char *vtname;
-+	int fd;
-+
-+	vtname = g_strdup_printf ("/dev/tty%d", vtno);
-+
-+	do {
-+		errno = 0;
-+		fd = open (vtname, O_RDWR | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	g_free (vtname);
-+	return fd;
-+}
-+
-+static gint
-+find_first_probably_free_vt (void)
-+{
-+	int fd, fdv;
-+	int vtno;
-+	unsigned short vtmask;
-+	struct vt_stat vtstat;
-+	guint v_state;
-+
-+	fdv = -1;
-+
-+	do {
-+		errno = 0;
-+		fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	if (fd >= 0) {
-+		if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) {
-+			v_state = vtstat.v_state;
-+		} else {
-+			close (fd);
-+			v_state = 0;
-+			fd = -1;
-+		}
-+	} else {
-+		v_state = 0;
-+	}
-+
-+	if (fd < 0) {
-+		do {
-+			errno = 0;
-+			fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0);
-+		} while (errno == EINTR);
-+
-+		if (fd >= 0) {
-+			if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0)
-+				v_state = vtstat.v_state;
-+		}
-+	}
-+
-+	for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) {
-+		/* Is this console in use? */
-+		if (v_state & vtmask)
-+			continue;
-+
-+		/* No, try to open it */
-+		fdv = open_vt (vtno);
-+		if (fdv >= 0)
-+			break;
-+
-+		/* If we're here, kernel indicated that the console was free,
-+		 * but we failed to open it. Just go on to higher VTs. */
-+	}
-+
-+        if (fdv >= 0)
-+                close (fdv);
-+        else
-+		vtno = -1;
-+
-+	if (fd >= 0)
-+		close (fd);
-+
-+	return vtno;
-+}
-+
- char *
- gdm_server_get_display_device (GdmServer *server)
- {
-@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer  *server,
- 
-         if (vtarg != NULL && ! gotvtarg) {
-                 argv[len++] = g_strdup (vtarg);
-+        } else if (!query_in_arglist && !gotvtarg) {
-+                gint vtnum = find_first_probably_free_vt ();
-+
-+                if (vtnum > 0)
-+                        argv [len++] = g_strdup_printf ("vt%d", vtnum);
-         }
- 
-         argv[len++] = NULL;
diff --git a/testing/gdm/gdm-welcome.pam b/testing/gdm/gdm-welcome.pam
deleted file mode 100644
index cc3811c19..000000000
--- a/testing/gdm/gdm-welcome.pam
+++ /dev/null
@@ -1,12 +0,0 @@
-#%PAM-1.0
-auth            required        pam_env.so
-auth            required        pam_permit.so
-
-account         required        pam_nologin.so
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so force revoke
diff --git a/testing/gdm/gdm.install b/testing/gdm/gdm.install
deleted file mode 100644
index b9732be50..000000000
--- a/testing/gdm/gdm.install
+++ /dev/null
@@ -1,29 +0,0 @@
-pkgname=gdm
-
-post_install() {
-  getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
-  getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
-  passwd -l gdm > /dev/null
-  chown -R gdm:gdm /var/lib/gdm > /dev/null
-
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  gconfpkg --install ${pkgname}
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    gconfpkg --uninstall ${pkgname}
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  getent passwd gdm >/dev/null 2>&1 && userdel gdm
-  getent group gdm >/dev/null 2>&1 && groupdel gdm
-}
diff --git a/testing/gdm/gdm.pam b/testing/gdm/gdm.pam
deleted file mode 100644
index 655299cb7..000000000
--- a/testing/gdm/gdm.pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-auth            optional        pam_gnome_keyring.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_gnome_keyring.so auto_start
-password        required        pam_unix.so
diff --git a/testing/gedit/PKGBUILD b/testing/gedit/PKGBUILD
deleted file mode 100644
index 82df3c320..000000000
--- a/testing/gedit/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 138894 2011-09-28 19:30:03Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gedit
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="A text editor for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf')
-makedepends=('gnome-doc-utils' 'intltool')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gedit.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('a3f62b20816a3f902bb811cc14ae01111e27ce266e49d39f5854fd45b2895348')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib --disable-scrollkeeper \
-      --disable-updater --disable-schemas-compile \
-      --enable-python
-  make
-}
-
-package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gedit/gedit.install b/testing/gedit/gedit.install
deleted file mode 100644
index 9d88a1341..000000000
--- a/testing/gedit/gedit.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-    update-desktop-database -q
-}
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/gedit.schemas ]; then
-        usr/sbin/gconfpkg --uninstall gedit
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/gjs/PKGBUILD b/testing/gjs/PKGBUILD
deleted file mode 100644
index c7ec3768a..000000000
--- a/testing/gjs/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 138896 2011-09-28 19:30:05Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=gjs
-pkgver=1.30.0
-pkgrel=1
-pkgdesc="Javascript Bindings for GNOME"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Gjs"
-license=('GPL')
-depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js')
-options=('!libtool')
-source=(http://download.gnome.org/sources/${pkgname}/1.30/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('ffe01980dd183abd96b2cc861d2e86ef12751d0a1af86daa4c491b82c74ac7b9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|python|python2|' scripts/make-tests
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/glew/PKGBUILD b/testing/glew/PKGBUILD
deleted file mode 100644
index 01b62ae91..000000000
--- a/testing/glew/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 138158 2011-09-17 21:02:46Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: SleepyDog
-
-pkgname=glew
-pkgver=1.7.0
-pkgrel=1
-pkgdesc="The OpenGL Extension Wrangler Library"
-arch=('i686' 'x86_64')
-url="http://glew.sourceforge.net"
-license=('BSD' 'MIT' 'GPL')
-depends=('libxmu' 'libxi' 'mesa')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz)
-sha1sums=('9266f2360c1687a96f2ea06419671d370b2928d1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|lib64|lib|' config/Makefile.linux
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GLEW_DEST="${pkgdir}/usr" install.all
-  install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a
-  chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver}
-}
diff --git a/testing/glib-networking/PKGBUILD b/testing/glib-networking/PKGBUILD
deleted file mode 100644
index b0fdf40d2..000000000
--- a/testing/glib-networking/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 138900 2011-09-28 19:30:09Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=glib-networking
-pkgver=2.30.0
-pkgrel=1
-pkgdesc="Network-related giomodules for glib"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas')
-makedepends=('intltool')
-options=('!libtool')
-install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('e28ca1e354d6519efb5c9c01c1f10e8a1a196710dfbcc5ea8f8aade3244e108c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/glib-networking --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/glib-networking/glib-networking.install b/testing/glib-networking/glib-networking.install
deleted file mode 100644
index 595f1c75b..000000000
--- a/testing/glib-networking/glib-networking.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/gio-querymodules usr/lib/gio/modules
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/glibmm/PKGBUILD b/testing/glibmm/PKGBUILD
deleted file mode 100644
index b5a225d8a..000000000
--- a/testing/glibmm/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 138898 2011-09-28 19:30:07Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase=glibmm
-pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.30.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-options=('!libtool')
-url="http://gtkmm.sourceforge.net/"
-sha256sums=('a7ad3fc34c2ba108511738a6ecbf9396edeb26776b2f9b5f4490551509ee0db4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package_glibmm() {
-  pkgdesc="Glib-- (glibmm) is a C++ interface for glib"
-  depends=('glib2' 'libsigc++2.0')
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-  make DESTDIR="${pkgdir}" install
-}
-
-package_glibmm-docs() {
-  pkgdesc="Developer documentation for glibmm"
-  cd "${srcdir}/${pkgbase}-${pkgver}/docs"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-applets/PKGBUILD b/testing/gnome-applets/PKGBUILD
deleted file mode 100644
index 3c9ed05d6..000000000
--- a/testing/gnome-applets/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 138902 2011-09-28 19:30:11Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-applets
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="GNOME Applets"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify' 'cpufrequtils')
-makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager' 'gnome-common')
-options=(!emptydirs)
-url="http://www.gnome.org"
-groups=(gnome)
-install=gnome-applets.install
-source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('18e41753d98644689126c3f237f4bf2e1b973cac15544166cef299ba6faa95ef')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \
-      --localstatedir=/var --disable-static \
-      --disable-scrollkeeper --disable-schemas-install \
-      --without-hal
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-applets-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-applets/gnome-applets.install b/testing/gnome-applets/gnome-applets.install
deleted file mode 100644
index dd9c34269..000000000
--- a/testing/gnome-applets/gnome-applets.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gnome-applets
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
deleted file mode 100644
index a76c1e73c..000000000
--- a/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-# Get access to /dev/rfkill for users
-# See https://bugzilla.redhat.com/show_bug.cgi?id=514798
-#
-# Updated for udev >= 154
-# http://bugs.debian.org/582188
-# https://bugzilla.redhat.com/show_bug.cgi?id=588660
-
-ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end"
-ACTION!="add|change", GOTO="gnome_bluetooth_end"
-KERNEL=="rfkill", TAG+="udev-acl"
-LABEL="gnome_bluetooth_end"
diff --git a/testing/gnome-bluetooth/PKGBUILD b/testing/gnome-bluetooth/PKGBUILD
deleted file mode 100644
index 8634bb523..000000000
--- a/testing/gnome-bluetooth/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 138905 2011-09-28 19:30:14Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-bluetooth
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="The GNOME Bluetooth Subsystem"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/GnomeBluetooth"
-license=('GPL' 'LGPL')
-depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf')
-makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-install=gnome-bluetooth.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-        61-gnome-bluetooth-rfkill.rules)
-sha256sums=('7f8f35baf4a785a4d966257c31ce6ee8eb4fe21bc83b26cadc55c244f583bbca'
-            'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-desktop-update \
-    --disable-icon-update \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m644 -D "${srcdir}/61-gnome-bluetooth-rfkill.rules" \
-                     "${pkgdir}/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules"
-  install -d ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/gnome-bluetooth" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
-}
diff --git a/testing/gnome-bluetooth/gnome-bluetooth.install b/testing/gnome-bluetooth/gnome-bluetooth.install
deleted file mode 100644
index 927142ee0..000000000
--- a/testing/gnome-bluetooth/gnome-bluetooth.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/gnome-color-manager/PKGBUILD b/testing/gnome-color-manager/PKGBUILD
deleted file mode 100644
index ded118aa2..000000000
--- a/testing/gnome-color-manager/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 138907 2011-09-28 19:30:15Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=gnome-color-manager
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Color profile manager for the GNOME desktop"
-arch=(i686 x86_64)
-url="http://projects.gnome.org/gnome-color-manager/"
-license=(GPL2)
-depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' 'mash')
-makedepends=('intltool' 'gtk-doc')
-install=gnome-color-manager.install
-options=('!libtool' '!emptydirs')
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2d03a7c1f308ab6e2ad89acc39f1f8a67fd0ff1cf3435f5f2269f7a422209273')
-
-build(){
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # man pages need docbook-sgml, which we don't have
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-color-manager \
-      --disable-static --disable-man-pages
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-color-manager/gnome-color-manager.install b/testing/gnome-color-manager/gnome-color-manager.install
deleted file mode 100644
index 04fda0ddc..000000000
--- a/testing/gnome-color-manager/gnome-color-manager.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-color-manager
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-contacts/PKGBUILD b/testing/gnome-contacts/PKGBUILD
deleted file mode 100644
index 1a0397c52..000000000
--- a/testing/gnome-contacts/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 138909 2011-09-28 19:30:17Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-contacts
-pkgver=3.2.0.1
-pkgrel=1
-pkgdesc="Contacts Manager for GNOME"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-groups=(gnome-extra)
-depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop')
-makedepends=('intltool' 'vala')
-install=
-source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('2d8e2a325ecc661805f6e7c6339b3876e766c1e227ff084dc02a7535e5983641')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD
deleted file mode 100644
index 7c6ff1146..000000000
--- a/testing/gnome-control-center/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 138911 2011-09-28 19:30:19Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="The Control Center for GNOME"
-arch=('i686' 'x86_64')
-depends=('gtk3' 'gsettings-desktop-schemas' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice' 'sound-theme-freedesktop' 'gnome-online-accounts' 'network-manager-applet')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
-            'apg: adds password generation for user accounts')
-makedepends=('gnome-doc-utils' 'intltool')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-control-center.install
-license=('GPL')
-options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('06c927dcbee2bf63e4960441ccb9bea55d12aa83078e5d71e9832d52fd1966aa')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-scrollkeeper --disable-update-mimedb
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
-
diff --git a/testing/gnome-control-center/gnome-control-center.install b/testing/gnome-control-center/gnome-control-center.install
deleted file mode 100644
index eb703319f..000000000
--- a/testing/gnome-control-center/gnome-control-center.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gnome-control-center
-
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        usr/sbin/gconfpkg --uninstall ${pkgname}
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/gnome-desktop/PKGBUILD b/testing/gnome-desktop/PKGBUILD
deleted file mode 100644
index bbdf5e193..000000000
--- a/testing/gnome-desktop/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 138913 2011-09-28 19:30:21Z ibiru $
-# Maintainer:  Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-desktop
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Library with common API for various GNOME modules"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('gsettings-desktop-schemas' 'startup-notification' 'gtk3')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('c5e8ba08f3c7ba12b5f4062c9b5bcef58383d1e3ec26161eb8bcf49dfea62ff5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --with-gnome-distributor="Arch Linux" \
-      --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-documents/PKGBUILD b/testing/gnome-documents/PKGBUILD
deleted file mode 100644
index 4e3dc7124..000000000
--- a/testing/gnome-documents/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 138915 2011-09-28 19:30:23Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=gnome-documents
-pkgver=0.2.0
-pkgrel=2
-pkgdesc="Documents Manager for GNOME"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL')
-groups=('gnome-extra')
-depends=('clutter-gtk' 'evince' 'gobject-introspection' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' 'tracker')
-makedepends=('intltool' 'vala')
-optdepends=('unoconv: Support for Libreoffice document types')
-options=('!libtool')
-install=gnome-documents.install
-source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('51c171a6b8a36ebe0b251d0b4d0acb360b5d7738fe8106006ea5504c03ad4932')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/gnome-documents
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-documents/gnome-documents.install b/testing/gnome-documents/gnome-documents.install
deleted file mode 100644
index 95114273e..000000000
--- a/testing/gnome-documents/gnome-documents.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD
deleted file mode 100644
index 4e9c5a3b2..000000000
--- a/testing/gnome-games/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 139159 2011-09-30 12:26:55Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-games
-pkgver=3.2.0
-pkgrel=2
-pkgdesc="Some Games for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsm' 'gconf' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection')
-options=('!emptydirs' '!libtool')
-install=gnome-games.install
-url="http://www.gnome.org"
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d8595b09ecbb3c94cd4a655f5fb56cd585fd9441038ad334cba29b92d592279d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper \
-      --disable-static \
-      --with-scores-user=root --with-scores-group=games \
-      --enable-introspection=yes
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  # Remove all scores, we generate them from postinstall
-  rm -rf "${pkgdir}/var"
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-games ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
-  sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' ${pkgdir}/usr/bin/gnome-sudoku
-}
diff --git a/testing/gnome-games/gnome-games.install b/testing/gnome-games/gnome-games.install
deleted file mode 100644
index 1f67c2e01..000000000
--- a/testing/gnome-games/gnome-games.install
+++ /dev/null
@@ -1,153 +0,0 @@
-pkgname=gnome-games
-scores=(glines.Large.scores
-	glines.Medium.scores
-	glines.Small.scores
-	gnibbles.1.0.scores
-	gnibbles.1.1.scores
-	gnibbles.2.0.scores
-	gnibbles.2.1.scores
-	gnibbles.3.0.scores
-	gnibbles.3.1.scores
-	gnibbles.4.0.scores
-	gnibbles.4.1.scores
-	gnobots2.classic_robots-safe.scores
-	gnobots2.classic_robots-super-safe.scores
-	gnobots2.classic_robots.scores
-	gnobots2.nightmare-safe.scores
-	gnobots2.nightmare-super-safe.scores
-	gnobots2.nightmare.scores
-	gnobots2.robots2-safe.scores
-	gnobots2.robots2-super-safe.scores
-	gnobots2.robots2.scores
-	gnobots2.robots2_easy-safe.scores
-	gnobots2.robots2_easy-super-safe.scores
-	gnobots2.robots2_easy.scores
-	gnobots2.robots_with_safe_teleport-safe.scores
-	gnobots2.robots_with_safe_teleport-super-safe.scores
-	gnobots2.robots_with_safe_teleport.scores
-	gnomine.Custom.scores
-	gnomine.Large.scores
-	gnomine.Medium.scores
-	gnomine.Small.scores
-	gnotravex.2x2.scores
-	gnotravex.3x3.scores
-	gnotravex.4x4.scores
-	gnotravex.5x5.scores
-	gnotravex.6x6.scores
-	gnotski.1.scores
-	gnotski.10.scores
-	gnotski.11.scores
-	gnotski.12.scores
-	gnotski.13.scores
-	gnotski.14.scores
-	gnotski.15.scores
-	gnotski.16.scores
-	gnotski.17.scores
-	gnotski.18.scores
-	gnotski.19.scores
-	gnotski.2.scores
-	gnotski.20.scores
-	gnotski.21.scores
-	gnotski.22.scores
-	gnotski.23.scores
-	gnotski.24.scores
-	gnotski.25.scores
-	gnotski.26.scores
-	gnotski.27.scores
-	gnotski.28.scores
-	gnotski.29.scores
-	gnotski.3.scores
-	gnotski.30.scores
-	gnotski.31.scores
-	gnotski.32.scores
-	gnotski.33.scores
-	gnotski.34.scores
-	gnotski.35.scores
-	gnotski.36.scores
-	gnotski.37.scores
-	gnotski.4.scores
-	gnotski.5.scores
-	gnotski.6.scores
-	gnotski.7.scores
-	gnotski.8.scores
-	gnotski.9.scores
-	gtali.Colors.scores
-	gtali.Regular.scores
-	mahjongg.bridges.scores
-	mahjongg.cloud.scores
-	mahjongg.confounding.scores
-	mahjongg.difficult.scores
-	mahjongg.dragon.scores
-	mahjongg.easy.scores
-	mahjongg.pyramid.scores
-	mahjongg.tictactoe.scores
-	mahjongg.ziggurat.scores
-	swell-foop.Large.scores
-	swell-foop.Medium.scores
-	swell-foop.Small.scores
-	quadrapassel.scores)
-
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  usr/sbin/gconfpkg --install ${pkgname}
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
-  for sz in Large Medium Small; do
-    if [ -e "opt/gnome/var/games/same-gnome.${sz}.scores" ]; then
-      mv "opt/gnome/var/games/same-gnome.${sz}.scores" \
-        "var/games/swell-foop.${sz}.scores"
-    elif [ -e "var/games/same-gnome.${sz}.scores" ]; then
-      mv "var/games/same-gnome.${sz}.scores" \
-        "var/games/swell-foop.${sz}.scores"
-    fi
-  done
-  if [ -e "opt/gnome/var/games/gnometris.scores" ]; then
-    mv "opt/gnome/var/games/gnometris.scores" \
-      "var/games/quadrapassel.scores"
-  elif [ -e "var/games/gnometris.scores" ]; then
-    mv "var/games/gnometris.scores" \
-      "var/games/quadrapassel.scores"
-  fi
-
-  for score in "${scores[@]}" ; do
-    if [ -e "var/games/${score}" ]; then
-      continue
-    fi
-    if [ -e "opt/gnome/var/games/${score}" ]; then
-      mv "opt/gnome/var/games/${score}" var/games/
-    else
-      touch "var/games/${score}"
-    fi
-    chown root:games "var/games/${score}"
-    chmod 664 "var/games/${score}"
-  done
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-
-  if [ -f usr/share/ggz/gnect-client.dsc ]; then
-    ggz-config -r -m usr/share/ggz/gnect-client.dsc >& /dev/null
-    ggz-config -r -m usr/share/ggz/gnibbles-client.dsc >& /dev/null
-    ggz-config -r -m usr/share/ggz/iagno-client.dsc >& /dev/null
-  fi
-}
-
-post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
-
-  for score in "${scores[@]}" ; do
-    rm -f "var/games/${score}"
-  done
-}
diff --git a/testing/gnome-keyring/PKGBUILD b/testing/gnome-keyring/PKGBUILD
deleted file mode 100644
index 0a638292d..000000000
--- a/testing/gnome-keyring/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-#$Id: PKGBUILD 138922 2011-09-28 19:30:29Z ibiru $
-# Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=gnome-keyring
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="GNOME Password Management daemon"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gtk3' 'dconf' 'libgcrypt' 'libcap-ng' 'p11-kit' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'python2')
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gnome-keyring.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('5bd7dbe18f983aae237517d1eb4b070295c7b848d16c2a9d0a8a6046ea0801bc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-keyring \
-      --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs \
-      --disable-schemas-compile --disable-update-mime
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-keyring/gnome-keyring.install b/testing/gnome-keyring/gnome-keyring.install
deleted file mode 100644
index 37d76c56a..000000000
--- a/testing/gnome-keyring/gnome-keyring.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-    update-mime-database usr/share/mime 1> /dev/null
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-    update-desktop-database -q
-    setcap cap_ipc_lock=ep usr/bin/gnome-keyring-daemon
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/gnome-menus/PKGBUILD b/testing/gnome-menus/PKGBUILD
deleted file mode 100644
index a50d65697..000000000
--- a/testing/gnome-menus/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 138924 2011-09-28 19:30:31Z ibiru $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-menus
-pkgver=3.2.0.1
-pkgrel=1
-pkgdesc="GNOME menu specifications"
-arch=('i686' 'x86_64')
-depends=('glib2' 'python2')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-license=('GPL' 'LGPL')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz
-        menus.patch)
-sha256sums=('17e2ea745b1e80fba4f6ec03c4bac561aa6e7ca275fcc79a3df3d318cb64972b'
-            'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np0 -i "$srcdir/menus.patch"
-
-  PYTHON=/usr/bin/python2 ./configure \
-      --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var  --disable-static
-  make
-}
-
-package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  sed -i "1s|#!/usr/bin/env python$|&2|" \
-    "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py"
-}
diff --git a/testing/gnome-menus/menus.patch b/testing/gnome-menus/menus.patch
deleted file mode 100644
index bf73e86cd..000000000
--- a/testing/gnome-menus/menus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- layout/applications.menu	2005-06-28 10:16:39.000000000 +0200
-+++ layout/applications.menu	2005-09-12 23:21:20.000000000 +0200
-@@ -7,7 +7,6 @@
-   <Directory>Applications.directory</Directory>
- 
-   <!-- Scan legacy dirs first, as later items take priority -->
--  <KDELegacyDirs/>
-   <LegacyDir>/etc/X11/applnk</LegacyDir>
-   <LegacyDir>/usr/share/gnome/apps</LegacyDir>
- 
-@@ -18,6 +17,14 @@
-   <!-- Read in overrides and child menus from applications-merged/ -->
-   <DefaultMergeDirs/>
- 
-+  <!-- Archlinux submenu -->
-+  <Menu>
-+    <Name>Archlinux</Name>
-+    <Directory>Archlinux.directory</Directory>
-+    <Include>
-+      <Category>Archlinux</Category>
-+    </Include>
-+  </Menu> <!-- End Archlinux -->
-   <!-- Accessories submenu -->
-   <Menu>
-     <Name>Accessories</Name>
diff --git a/testing/gnome-online-accounts/PKGBUILD b/testing/gnome-online-accounts/PKGBUILD
deleted file mode 100644
index 9acf73c48..000000000
--- a/testing/gnome-online-accounts/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 138926 2011-09-28 19:30:33Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-online-accounts
-pkgver=3.2.0.1
-pkgrel=1
-pkgdesc="GNOME service to access online accounts"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL')
-depends=('libwebkit3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme')
-makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
-options=(!libtool)
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('b53e1429930294872b64987bf18e8f2cf07adaac5b1a8c9c15d2fb95ea1e8b2b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-online-accounts/gnome-online-accounts.install b/testing/gnome-online-accounts/gnome-online-accounts.install
deleted file mode 100644
index 2e02b7952..000000000
--- a/testing/gnome-online-accounts/gnome-online-accounts.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install () {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gnome-panel/PKGBUILD b/testing/gnome-panel/PKGBUILD
deleted file mode 100644
index fc2103b6b..000000000
--- a/testing/gnome-panel/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 138928 2011-09-28 19:30:36Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-panel
-pkgver=3.2.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-pkgdesc="The GNOME Panel"
-url="http://www.gnome.org"
-depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf' 'telepathy-glib')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra')
-install=gnome-panel.install
-groups=('gnome')
-replaces=('gnome-panel-bonobo')
-provides=("gnome-panel-bonobo=${pkgver}")
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('83daffb85db57609330da488c5344e3121ed74cd809701a11109ecd7c97bde0f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-panel \
-      --disable-scrollkeeper \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-panel-3.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-panel/gnome-panel.install b/testing/gnome-panel/gnome-panel.install
deleted file mode 100644
index e3175df5e..000000000
--- a/testing/gnome-panel/gnome-panel.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gnome-panel
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gnome-phone-manager/PKGBUILD b/testing/gnome-phone-manager/PKGBUILD
deleted file mode 100644
index e55133299..000000000
--- a/testing/gnome-phone-manager/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 138930 2011-09-28 19:30:39Z ibiru $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-phone-manager
-pkgver=0.67
-pkgrel=1
-pkgdesc="Control your mobile phone from your GNOME desktop."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/PhoneManager"
-license=('GPL')
-depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' 'libcanberra')
-makedepends=('intltool' 'gnome-common')
-options=('!emptydirs' '!libtool')
-install=gnome-phone-manager.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/${pkgver}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('bb21c57b8bbe0481bccb373765f9d42f260f6005f2d9c55878bfc511a5541caf')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-phone-manager ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-phone-manager/gnome-phone-manager.install b/testing/gnome-phone-manager/gnome-phone-manager.install
deleted file mode 100644
index 91212fa2e..000000000
--- a/testing/gnome-phone-manager/gnome-phone-manager.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-phone-manager
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/gnome-pilot/PKGBUILD b/testing/gnome-pilot/PKGBUILD
deleted file mode 100644
index 5a3614314..000000000
--- a/testing/gnome-pilot/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 138932 2011-09-28 19:30:42Z ibiru $
-# Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-pilot
-pkgver=2.91.93
-pkgrel=1
-pkgdesc="Pilot Support for Gnome"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('pilot-link' 'evolution-data-server')
-makedepends=('intltool' 'gob2' 'gnome-doc-utils' 'gnome-panel')
-optdepends=('gnome-panel')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gnome-pilot.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('56fbb1c54621dcda9cde4c7ac0754d5d9d68ae2ae1eb63acffb00817e4a8dd21')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-pilot \
-      --localstatedir=/var --disable-static \
-      --without-hal
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-pilot/gnome-pilot.install b/testing/gnome-pilot/gnome-pilot.install
deleted file mode 100644
index 616daa0e4..000000000
--- a/testing/gnome-pilot/gnome-pilot.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-pilot
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/gnome-power-manager/PKGBUILD b/testing/gnome-power-manager/PKGBUILD
deleted file mode 100644
index 240f7151b..000000000
--- a/testing/gnome-power-manager/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 138934 2011-09-28 19:30:45Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-power-manager
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Power management tools."
-arch=(i686 x86_64)
-url="http://www.gnome.org/projects/gnome-power-manager/"
-license=('GPL')
-depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
-options=(!emptydirs)
-install=gnome-power-manager.install
-groups=(gnome-extra)
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d66f97f6cff716dd3c612f1a17b0e2b5dfb138deb92ea3d0a782a0144a7eab95')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-power-manager \
-      --disable-scrollkeeper \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-power-manager/gnome-power-manager.install b/testing/gnome-power-manager/gnome-power-manager.install
deleted file mode 100644
index 4666938db..000000000
--- a/testing/gnome-power-manager/gnome-power-manager.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.91.92) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-power-manager
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-screensaver/PKGBUILD b/testing/gnome-screensaver/PKGBUILD
deleted file mode 100644
index 4c6b1c8e8..000000000
--- a/testing/gnome-screensaver/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 138936 2011-09-28 19:30:49Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-screensaver
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/GnomeScreensaver"
-backup=(etc/pam.d/gnome-screensaver)
-depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas')
-makedepends=('pkgconfig' 'intltool' 'libxss')
-groups=('gnome')
-options=(!emptydirs)
-install=gnome-screensaver.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-       gnome-screensaver.pam)
-sha256sums=('305f4a5be8736c4cf5e55b8288b7e177907bafa26e39273d1bb65ad1862295ed'
-            '2744d1fc39da46fc681b7cf1c9230d2035b2bb8d9f510213fbe439c114eb76a2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-screensaver \
-      --localstatedir=/var \
-      --with-mit-ext
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 "${srcdir}/gnome-screensaver.pam" "${pkgdir}/etc/pam.d/gnome-screensaver"
-}
diff --git a/testing/gnome-screensaver/gnome-screensaver.install b/testing/gnome-screensaver/gnome-screensaver.install
deleted file mode 100644
index 3b0e06046..000000000
--- a/testing/gnome-screensaver/gnome-screensaver.install
+++ /dev/null
@@ -1,7 +0,0 @@
-pkgname=gnome-screensaver
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        usr/sbin/gconfpkg --uninstall ${pkgname}
-    fi
-}
diff --git a/testing/gnome-screensaver/gnome-screensaver.pam b/testing/gnome-screensaver/gnome-screensaver.pam
deleted file mode 100644
index c776a5410..000000000
--- a/testing/gnome-screensaver/gnome-screensaver.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth        required     pam_unix_auth.so
-auth        optional     pam_gnome_keyring.so
diff --git a/testing/gnome-session/PKGBUILD b/testing/gnome-session/PKGBUILD
deleted file mode 100644
index 1db027014..000000000
--- a/testing/gnome-session/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 138938 2011-09-28 19:30:52Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-session
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="The GNOME Session Handler"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('upower' 'gtk3' 'gconf' 'json-glib' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl' 'gsettings-desktop-schemas' 'consolekit' 'libsm' 'dconf')
-makedepends=('intltool' 'mesa' 'xtrans')
-options=('!emptydirs')
-install=gnome-session.install
-url="http://www.gnome.org"
-groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4b23d95b1ee622c7d1d600d3a88c8ded787d9a49567b0235208d2e600f131e3e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-session/gnome-session.install b/testing/gnome-session/gnome-session.install
deleted file mode 100644
index 74cf4ed22..000000000
--- a/testing/gnome-session/gnome-session.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.91.91.3-3) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-session
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-settings-daemon/PKGBUILD b/testing/gnome-settings-daemon/PKGBUILD
deleted file mode 100644
index 576f3c5fe..000000000
--- a/testing/gnome-settings-daemon/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 138940 2011-09-28 19:30:57Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-settings-daemon
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="The GNOME Settings daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libgnomekbd' 'gnome-desktop' 'libnotify' 'hicolor-icon-theme' 'libcanberra-pulse' 'gsettings-desktop-schemas' 'nss' 'gconf' 'dconf' 'pulseaudio' 'pulseaudio-alsa' 'upower')
-makedepends=('intltool' 'gtk-doc' 'gnome-desktop')
-options=('!emptydirs' '!libtool')
-install=gnome-settings-daemon.install
-url="http://www.gnome.org"
-groups=('gnome')
-replaces=(gnome-settings-daemon-pulse)
-conflicts=(gnome-settings-daemon-pulse)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('a85242ce60b9c9bb3fbad124ee06430a408f39fa31d2d4ea29dc179db724447b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static --enable-pulse \
-      --with-pnpids=/usr/share/libgnome-desktop-3.0/pnp.ids
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-settings-daemon/gnome-settings-daemon.install b/testing/gnome-settings-daemon/gnome-settings-daemon.install
deleted file mode 100644
index 483fb9450..000000000
--- a/testing/gnome-settings-daemon/gnome-settings-daemon.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-settings-daemon
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-shell/PKGBUILD b/testing/gnome-shell/PKGBUILD
deleted file mode 100644
index e7e861a31..000000000
--- a/testing/gnome-shell/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 138942 2011-09-28 19:31:01Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Flamelab <panosfilip@gmail.com
-
-pkgname=gnome-shell
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="The next generation GNOME Shell"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/GnomeShell"
-license=('GPL2')
-depends=('mutter' 'gjs' 'libcroco' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libpulse' 'folks' 'telepathy-logger' 'networkmanager' 'caribou')
-makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('network-manager-applet: shell integration for networkmanager')
-options=('!libtool' '!emptydirs')
-install=gnome-shell.install
-groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('55f8237f4ca517bcfa02bbf88fbcb9afcdc9b252fb9612b84a65409a1f144324')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-shell \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-shell ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-shell/gnome-shell.install b/testing/gnome-shell/gnome-shell.install
deleted file mode 100644
index a07105c24..000000000
--- a/testing/gnome-shell/gnome-shell.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gnome-shell
-
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/gnome-system-monitor/PKGBUILD b/testing/gnome-system-monitor/PKGBUILD
deleted file mode 100644
index ececde354..000000000
--- a/testing/gnome-system-monitor/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 138945 2011-09-28 19:31:08Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-system-monitor
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="A system monitor for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme')
-makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool')
-options=(!emptydirs)
-url="http://www.gnome.org"
-groups=('gnome-extra')
-install=gnome-system-monitor.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('169c82bd1744adba1a4e3f384c06d9ff48aefac5d0f56e8ac4ad48b6f7f5810c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-system-monitor/gnome-system-monitor.install b/testing/gnome-system-monitor/gnome-system-monitor.install
deleted file mode 100644
index e2957a570..000000000
--- a/testing/gnome-system-monitor/gnome-system-monitor.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gnome-system-monitor
-
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        usr/sbin/gconfpkg --uninstall ${pkgname}
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/gnome-terminal/PKGBUILD b/testing/gnome-terminal/PKGBUILD
deleted file mode 100644
index 829884f78..000000000
--- a/testing/gnome-terminal/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 138947 2011-09-28 19:31:12Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-terminal
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="The GNOME Terminal Emulator"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm')
-makedepends=('gnome-doc-utils' 'intltool' 'gtk2')
-options=('!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-terminal.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('42ca48cff087de770d4783b19653794e82285334144b30557948f852521299b1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-terminal ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-terminal/gnome-terminal.install b/testing/gnome-terminal/gnome-terminal.install
deleted file mode 100644
index 04c2b3c2c..000000000
--- a/testing/gnome-terminal/gnome-terminal.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-terminal
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/gnome-themes-standard/PKGBUILD b/testing/gnome-themes-standard/PKGBUILD
deleted file mode 100644
index 14e8f3e2e..000000000
--- a/testing/gnome-themes-standard/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 138949 2011-09-28 19:31:16Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=gnome-themes-standard
-pkgver=3.2.0.2
-pkgrel=1
-pkgdesc="Default themes for the GNOME desktop"
-arch=('i686' 'x86_64')
-url="http://abattis.org/cantarell/"
-license=('GPL2')
-depends=('cantarell-fonts' 'gtk3' 'gtk-engines' 'librsvg')
-makedepends=('intltool')
-groups=('gnome')
-replaces=('gnome-themes')
-conflicts=('gnome-themes')
-source=(http://download.gnome.org/sources/$pkgname/3.2/$pkgname-${pkgver}.tar.xz)
-sha256sums=('49b8177fcc6693690eceef207f78173f0ca34bdef873a6c1fed90bef28791bc1')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-utils/PKGBUILD b/testing/gnome-utils/PKGBUILD
deleted file mode 100644
index 399e0db33..000000000
--- a/testing/gnome-utils/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-#  $Id: PKGBUILD 138953 2011-09-28 19:31:24Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-utils
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Common GNOME utilities for viewing disk usage, logs and fonts, taking screenshots, managing dictionaries and searching files"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('libgtop' 'libcanberra' 'libsm' 'gconf' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf')
-makedepends=('gnome-doc-utils' 'pkgconfig' 'intltool')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome-extra')
-install=gnome-utils.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('532e071ad772afa9bcd116144bc6b644c8af3daf2eb3f76f6fa306aced1ef5f8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --libexecdir=/usr/lib/gnome-utils \
-        --localstatedir=/var --disable-static \
-        --disable-scrollkeeper \
-        --disable-schemas-compile \
-        --disable-schemas-install
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-utils-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-
-  # remove it also from Xfce menu that ships its own thingy
-  sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-dictionary.desktop
-  sed -i -e "s/NotShowIn\=KDE\;/NotShowIn\=KDE\;XFCE\;/" ${pkgdir}/usr/share/applications/gnome-screenshot.desktop
-}
diff --git a/testing/gnome-utils/gnome-utils.install b/testing/gnome-utils/gnome-utils.install
deleted file mode 100644
index a04bda405..000000000
--- a/testing/gnome-utils/gnome-utils.install
+++ /dev/null
@@ -1,26 +0,0 @@
-pkgname=gnome-utils
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
diff --git a/testing/gobject-introspection/PKGBUILD b/testing/gobject-introspection/PKGBUILD
deleted file mode 100644
index d84a0bd87..000000000
--- a/testing/gobject-introspection/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 138955 2011-09-28 19:31:28Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gobject-introspection
-pkgver=1.30.0
-pkgrel=1
-pkgdesc="Introspection system for GObject-based libraries"
-url="http://live.gnome.org/GObjectInstrospection"
-arch=('x86_64' 'i686')
-license=('LGPL' 'GPL')
-depends=('glib2' 'python2')
-makedepends=('cairo')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.30/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8e4274579096e983fad3148cdab50295a4701e45cd9a4e02f7242fc0a04c47b2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  sed -i '1s|#!/usr/bin/env python$|&2|' \
-    "${pkgdir}"/usr/lib/gobject-introspection/giscanner/*.py
-}
diff --git a/testing/grilo-plugins/PKGBUILD b/testing/grilo-plugins/PKGBUILD
deleted file mode 100644
index e1958d49e..000000000
--- a/testing/grilo-plugins/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 138959 2011-09-28 19:31:35Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=grilo-plugins
-pkgver=0.1.17
-pkgrel=1
-pkgdesc="Plugins for Grilo"
-url="http://www.gnome.org"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('grilo')
-makedepends=('gupnp-av' 'libgdata' 'quvi' 'sqlite3' 'gmime' 'libgcrypt' 'rest')
-optdepends=('gupnp-av: uPnP plugin'
-            'libgdata: Youtube plugin'
-            'quvi: Youtube plugin'
-            'sqlite3: Podcasts plugin'
-            'gmime: Podcasts plugin'
-            'sqlite3: Bookmarks plugin'
-            'sqlite3: Metadata store plugin'
-            'libgcrypt: Vimeo plugin'
-            'rest: Blip.tv plugin')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('c77f70c02ab8a9abb7cddc909f90853d13e2a18d4b69db65a411082c3ef79b0a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
-    --enable-shoutcast
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/grilo/PKGBUILD b/testing/grilo/PKGBUILD
deleted file mode 100644
index 324b0ed41..000000000
--- a/testing/grilo/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 138957 2011-09-28 19:31:32Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=grilo
-pkgver=0.1.17
-pkgrel=1
-pkgdesc="Framework that provides access to various sources of multimedia content"
-url="http://www.gnome.org"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('gtk3' 'libxml2' 'libsoup')
-makedepends=('gobject-introspection' 'gtk-doc' 'vala')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('f88406b1737bdf0dc38c3acda418983084afe62ddc09fefd14a95f42ec727eaf')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gssdp/PKGBUILD b/testing/gssdp/PKGBUILD
deleted file mode 100644
index 2bf5c080c..000000000
--- a/testing/gssdp/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 138962 2011-09-28 19:31:41Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=gssdp
-pkgver=0.10.0
-pkgrel=1
-pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
-arch=('i686' 'x86_64')
-url="http://gupnp.org/"
-license=('LGPL')
-depends=('libsoup')
-makedepends=('gobject-introspection' 'gtk2' 'gtk-doc')
-optdepends=('gtk2: gssdp-device-sniffer')
-options=('!libtool')
-source=(http://gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz)
-sha256sums=('94de92bb4f7906ed2f047b0146a3b21d53d09908fe1f0149484f61c6afc598ea')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gstreamer0.10-ugly/PKGBUILD b/testing/gstreamer0.10-ugly/PKGBUILD
deleted file mode 100644
index 75c57e041..000000000
--- a/testing/gstreamer0.10-ugly/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 139587 2011-10-03 14:22:40Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gstreamer0.10-ugly
-pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
-pkgver=0.10.18
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-url="http://gstreamer.freedesktop.org/"
-options=(!libtool)
-source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.bz2)
-md5sums=('04a7009a4efea2844075949c111f5e4d')
-
-build() {
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-  sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile
-}
-
-package_gstreamer0.10-ugly() {
-  pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries"
-  depends=('gstreamer0.10-base>=0.10.34')
-  
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gstreamer0.10-ugly-plugins() {
-  pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
-  depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-  groups=('gstreamer0.10-plugins')
-  replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-  conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make -C ext DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gthumb/PKGBUILD b/testing/gthumb/PKGBUILD
deleted file mode 100644
index 8878dee95..000000000
--- a/testing/gthumb/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 138964 2011-09-28 19:31:45Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gthumb
-pkgver=2.13.91
-pkgrel=1
-pkgdesc="Image browser and viewer for the GNOME Desktop"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://gthumb.sourceforge.net/"
-depends=('desktop-file-utils' 'libunique' 'gconf' 'exiv2' 'libsoup-gnome' 'clutter-gtk2')
-makedepends=('intltool' 'gnome-doc-utils' 'libsm' 'gstreamer0.10-base')
-optdepends=('gstreamer0.10-base: video support')
-options=('!libtool' '!emptydirs')
-install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b1f7686572829cf5cadae58e7d45e43a056f19929fd6d80d7ff9ac7c53bbfe90')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gthumb "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gthumb/gthumb.install b/testing/gthumb/gthumb.install
deleted file mode 100644
index 6046ebb6f..000000000
--- a/testing/gthumb/gthumb.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gthumb
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gtkhtml4/PKGBUILD b/testing/gtkhtml4/PKGBUILD
deleted file mode 100644
index 3e49654c1..000000000
--- a/testing/gtkhtml4/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 138969 2011-09-28 19:31:50Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtkhtml4
-_pkgbasename=gtkhtml
-pkgver=4.2.0
-pkgrel=1
-pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup')
-makedepends=('intltool')
-url="http://www.gnome.org"
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz)
-sha256sums=('a4e50ac159fe49ddac07a3d0fba386ac90b404afce770a89e6077580578c38af')
-
-build() {
-    cd "${srcdir}/${_pkgbasename}-${pkgver}"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --libexecdir=/usr/lib/gtkhtml4 \
-        --localstatedir=/var --disable-static
-    make
-}
-
-package() {
-    cd "${srcdir}/${_pkgbasename}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtkmm3/PKGBUILD b/testing/gtkmm3/PKGBUILD
deleted file mode 100644
index a1a47bc89..000000000
--- a/testing/gtkmm3/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 138971 2011-09-28 19:31:52Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=gtkmm3
-_pkgbasename=gtkmm
-pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.2.0
-pkgrel=1
-arch=('i686' 'x86_64')
-makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-url="http://gtkmm.sourceforge.net/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${_pkgbasename}/3.2/${_pkgbasename}-${pkgver}.tar.xz)
-sha256sums=('6195dac58454e287ae17d380c028827f0a49669a3b93f85e2d4f6eb9459674f2')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package_gtkmm3() {
-  pkgdesc="C++ bindings for gtk3"
-  depends=('gtk3' 'pangomm' 'atkmm')
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gtkmm3-docs() {
-  pkgdesc="Developer documentation for gtkmm v3"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make -C docs DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtksourceview3/PKGBUILD b/testing/gtksourceview3/PKGBUILD
deleted file mode 100644
index 035fe75e5..000000000
--- a/testing/gtksourceview3/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 138973 2011-09-28 19:31:54Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtksourceview3
-_pkgbasename=gtksourceview
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="A text widget adding syntax highlighting and more to GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libxml2')
-makedepends=('intltool' 'pkgconfig' 'gobject-introspection')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.xz)
-sha256sums=('63582fbb25eb756865bfdcc38b2839c80a6bd2388bba8c7edce09aef791c360e')
-
-build() {
-  cd "${srcdir}/$_pkgbasename-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/$_pkgbasename-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gucharmap/PKGBUILD b/testing/gucharmap/PKGBUILD
deleted file mode 100644
index 79e777062..000000000
--- a/testing/gucharmap/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 138975 2011-09-28 19:31:56Z ibiru $
-# Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=gucharmap
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Gnome Unicode Charmap"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-depends=('gconf' 'hicolor-icon-theme')
-makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-install=gucharmap.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('42aacc32beeb0ebb24db519aaceeb184e4212fdd7732bd7b0f6a15f00afc9501')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-scrollkeeper  --enable-introspection
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gucharmap ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gucharmap/gucharmap.install b/testing/gucharmap/gucharmap.install
deleted file mode 100644
index 4de3253f6..000000000
--- a/testing/gucharmap/gucharmap.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gucharmap
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gupnp-av/PKGBUILD b/testing/gupnp-av/PKGBUILD
deleted file mode 100644
index 8e35a8052..000000000
--- a/testing/gupnp-av/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 138979 2011-09-28 19:32:00Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
-# Contributor: Denis Zawada <deno@rootnode.net>
-
-pkgname=gupnp-av
-pkgver=0.8.0
-pkgrel=1
-pkgdesc="Library to ease handling and implementation of UPnP A/V profiles"
-arch=('i686' 'x86_64')
-url="http://gupnp.org/"
-license=('LGPL')
-depends=('gupnp')
-makedepends=('gobject-introspection' 'gtk-doc')
-options=('!libtool')
-source=(http://gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz)
-sha256sums=('e6aa032377488cedc4e347519bd30701c583780b7c54f00bab083f2316a93dc9')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gupnp/PKGBUILD b/testing/gupnp/PKGBUILD
deleted file mode 100644
index 3a86e8bb7..000000000
--- a/testing/gupnp/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 138977 2011-09-28 19:31:58Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=gupnp
-pkgver=0.16.1
-pkgrel=1
-pkgdesc="An object-oriented UPNP framework"
-arch=('i686' 'x86_64')
-url="http://gupnp.org/"
-license=('LGPL')
-depends=('gssdp')
-makedepends=('gobject-introspection' 'gtk-doc')
-optdepends=('python2: gupnp-binding-tool')
-options=('!libtool')
-source=(http://gupnp.org/sites/all/files/sources/$pkgname-$pkgver.tar.gz)
-sha256sums=('f01a1f4fd36ce161a3df29fa83e1a0a2fb40d3c9f30f6b403e7791688ad24cfe')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  sed -i '1s|^#!.*python$|&2|' tools/gupnp-binding-tool
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD
deleted file mode 100644
index f85013801..000000000
--- a/testing/gvfs/PKGBUILD
+++ /dev/null
@@ -1,115 +0,0 @@
-# $Id: PKGBUILD 138981 2011-09-28 19:32:02Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.10.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2'
-             'libarchive' 'gnome-disk-utility' 'pkgconfig' 'intltool'
-             'libimobiledevice' 'namcap')
-url="http://www.gnome.org"
-options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('50970f9f9052ecb6ab83860b366c718994bf618695010c11e1391ca886f71db8')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gvfs \
-      --with-bash-completion-dir=/etc/bash_completion.d
-  make
-}
-
-package_gvfs() {
-  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('libsoup-gnome' 'gnome-disk-utility' 'libcdio' 'fuse' 'libarchive')
-  optdepends=('gvfs-afc: AFC (mobile devices) support'
-              'gvfs-smb: SMB/CIFS (Windows client) support'
-              'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
-              'gvfs-obexftp: ObexFTP (bluetooth) support'
-              'gvfs-afp: Apple Filing Protocol (AFP) support')
-  install=gvfs.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -e 's/^am__append_3/#am__append_3/' \
-      -e 's/^am__append_4/#am__append_4/' \
-      -i monitor/Makefile
-  make DESTDIR="${pkgdir}" install
-
-  cd "${pkgdir}"
-  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
-  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
-  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
-  rm usr/share/GConf/gsettings/gvfs-smb.convert
-}
-
-package_gvfs-smb() {
-  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring')
-  install=gvfs-smb.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -m755 -d "${pkgdir}/usr/lib/gvfs"
-  install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
-
-  install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/"
-  install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
-
-  install -Dm644 org.gnome.system.smb.gschema.xml \
-    "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
-  install -Dm644 gvfs-smb.convert \
-    "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert"
-}
-
-package_gvfs-afc() {
-  pkgdesc="AFC (mobile devices) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'libimobiledevice')
-  install=gvfs-module.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc"
-  install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gvfs-gphoto2() {
-  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev')
-  install=gvfs-module.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2"
-  install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gvfs-obexftp() {
-  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
-  depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server')
-  install=gvfs-module.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp"
-  install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount"
-}
-
-package_gvfs-afp() {
-  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
-  depends=("gvfs=${pkgver}")
-  install=gvfs-module.install
-  install -m755 -d "${pkgdir}/usr/lib/gvfs"
-  install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
-  install -m755 .libs/gvfsd-afp{,-browse} "${pkgdir}/usr/lib/gvfs/"
-  install -m644 afp{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
-
-}
diff --git a/testing/gvfs/gvfs-module.install b/testing/gvfs/gvfs-module.install
deleted file mode 100644
index 09d1f11ec..000000000
--- a/testing/gvfs/gvfs-module.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/testing/gvfs/gvfs-smb.install b/testing/gvfs/gvfs-smb.install
deleted file mode 100644
index 0b8783c7b..000000000
--- a/testing/gvfs/gvfs-smb.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/gvfs/gvfs.install b/testing/gvfs/gvfs.install
deleted file mode 100644
index 9458b1513..000000000
--- a/testing/gvfs/gvfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  usr/bin/gio-querymodules usr/lib/gio/modules
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  usr/bin/gio-querymodules usr/lib/gio/modules
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/hplip/hplip-cups-1.5.0-compatibility.patch b/testing/hplip/hplip-cups-1.5.0-compatibility.patch
deleted file mode 100644
index a4039e6c9..000000000
--- a/testing/hplip/hplip-cups-1.5.0-compatibility.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- hplip-3.11.7~/prnt/hpps/hppsfilter.c	2011-07-24 18:58:05.000000000 +0000
-+++ hplip-3.11.7/prnt/hpps/hppsfilter.c	2011-08-09 20:51:54.150214165 +0000
-@@ -38,6 +38,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <cups/cups.h>
-+#include <cups/ppd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- 
diff --git a/testing/hpoj/PKGBUILD b/testing/hpoj/PKGBUILD
deleted file mode 100644
index a523ec699..000000000
--- a/testing/hpoj/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 139143 2011-09-30 09:12:18Z eric $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-
-
-pkgname=hpoj
-pkgver=0.91
-pkgrel=17
-pkgdesc="Hewlett-Packard OfficeJet, PSC, LaserJet, and PhotoSmart printer multi-function peripherals (MFPs) drivers"
-arch=('i686' 'x86_64')
-url="http://hpoj.sourceforge.net"
-license=('GPL' 'custom')
-depends=('perl' 'libusb-compat' 'net-snmp' 'hplip>=1.7.2')
-makedepends=('qt3')
-optdepends=('qt3: for using xojpanel')
-install=hpoj.install
-source=(http://downloads.sourceforge.net/sourceforge/hpoj/$pkgname-$pkgver.tgz \
-	hpoj-gcc4.patch hpoj-kernel26.patch hpoj-pack.patch \
-        hpoj_gcc43.diff hpoj0.91-snmp5.5.patch)
-md5sums=('0e083aeab9b00495aa433fa9465456e0' '347bb155c5dde443a93d92d8e64579a2'\
-         '18481d3dcf6e9cadf0a3d196ee164e37' '1c3b99f1a2178675d56ece29daba0fd7'\
-         '42bb57791cacf83e4d339e3653ad003e' 'af1cf13e95ff2654b84e470d0e18f537')
-sha1sums=('36785cf1a925f569ed3983b8c068620e2c9b4456' 'cd2d37c2620e29b92b96fe779d10a6635c7f31b7'\
-         'fe3328fd7a43ec83d76d0d7fb7be6c41027cddb3' '80258e3190ffb514c20386e8a7cf70ee18df95a5'\
-         '22409b96d7bc67a10384a88c6b710981c0b90078' '4827cfa319bcd74ff8956e1bc69360f319a26c6a')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  # adding various patches
-   patch -Np1 -i ../hpoj-gcc4.patch
-   patch -Np1 -i ../hpoj-kernel26.patch
-   patch -Np1 -i ../hpoj-pack.patch
-   patch -Np1 -i ../hpoj_gcc43.diff
-   patch -Np1 -i ../hpoj0.91-snmp5.5.patch
-  ./configure --prefix=/usr
-   make
-}
-
-package() {
-   cd "$srcdir"/$pkgname-$pkgver
-   make prefix="$pkgdir"/usr/ user_install
-   mkdir -p "$pkgdir"/etc/rc.d
-   mkdir -p "$pkgdir"/usr/lib/sane
-   mkdir -p "$pkgdir"/usr/lib/cups/backend
-   install -m 644 lib/sane/libsane-hpoj.so.1.0 "$pkgdir"/usr/lib/sane
-   install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-   install -D -m644 LICENSE.OpenSSL $pkgdir/usr/share/licenses/$pkgname/LICENSE.OpenSSL
-   cd "$pkgdir"/usr/lib/sane  
-   ln -s libsane-hpoj.so.1.0 libsane-hpoj.so
-   ln -s libsane-hpoj.so.1.0 libsane-hpoj.so.1
-   ln -s /usr/sbin/ptal-init "$pkgdir"/etc/rc.d
-   ln -s /usr/sbin/ptal-cups "$pkgdir"/usr/lib/cups/backend/ptal
- }
diff --git a/testing/hpoj/hpoj-gcc4.patch b/testing/hpoj/hpoj-gcc4.patch
deleted file mode 100644
index ab1c125dd..000000000
--- a/testing/hpoj/hpoj-gcc4.patch
+++ /dev/null
@@ -1,194 +0,0 @@
---- hpoj-0.91/lib/hpojip/xjpg_fix.c.gcc4	2002-07-25 11:01:24.000000000 +0200
-+++ hpoj-0.91/lib/hpojip/xjpg_fix.c	2005-03-01 23:05:52.905482223 +0100
-@@ -389,7 +389,7 @@
- \*****************************************************************************/
- 
- 
--#define MYLOCATE(p) (void *)(p)=(g->headerBuffer+lenAddedHeader)
-+#define MYLOCATE(p) (p)=(typeof(p))(g->headerBuffer+lenAddedHeader)
- #define MYWRITE(p) lenAddedHeader+=sizeof(*(p))
- #define MYWRITEBUF(data,datalen) \
-     do { \
---- hpoj-0.91/mlcd/ExMgr.h.gcc4	2003-11-04 02:03:18.000000000 +0100
-+++ hpoj-0.91/mlcd/ExMgr.h	2005-03-01 23:38:34.297977986 +0100
-@@ -127,8 +127,8 @@
- 	QueueEntry(): prev(0),next(0) { } 
- #ifdef JD_DEBUGLITE
- 	void dump(void) {
--		printf("QueueEntry(0x%8.8X): prev=0x%8.8X, next=0x%8.8X\n",
--			(int)this,(int)prev,(int)next);
-+		printf("QueueEntry(%p): prev=%p, next=%p\n",
-+			this,prev,next);
- 	}
- #endif
- 	int isEnqueued(void) { return (prev || next); }
---- hpoj-0.91/mlcd/ExMgr.cpp.gcc4	2003-11-04 02:03:18.000000000 +0100
-+++ hpoj-0.91/mlcd/ExMgr.cpp	2005-03-01 23:41:49.408864110 +0100
-@@ -248,8 +248,8 @@
- 
- #ifdef JD_DEBUGLITE
- void ExWatchdogTimer::dump(void) {
--	printf("pMsgHandler=0x%8.8X\n",(int)pMsgHandler);
--	printf("pMsg=0x%8.8X\n",(int)pMsg);
-+	printf("pMsgHandler=%p\n",pMsgHandler);
-+	printf("pMsg=%p\n",pMsg);
- 	printf("delay=%d seconds, %d usec\n",
- 		(int)delay.tv_sec,(int)delay.tv_usec);
- 	printf("cancelled=%d\n",cancelled);
-@@ -1307,13 +1307,13 @@
- 	printf("\tstate=%d\n",session[scd].state);
- 	printf("\tfd=%d\n",session[scd].fd);
- 	printf("\tscdlink=%d\n",session[scd].scdlink);
--	printf("\tpLookup=0x%8.8X\n",(int)session[scd].pLookup);
-+	printf("\tpLookup=%p\n",session[scd].pLookup);
- 	printf("\toutstandingForwardBdrCount=%d\n",
- 		session[scd].outstandingForwardBdrCount);
- 	printf("\tpReverseBdrQueue: depth=%d\n",
- 		session[scd].pReverseBdrQueue->depth());
--	printf("\ttcd=0x%8.8X\n",(int)session[scd].tcd);
--	printf("\tpCommandBdr=0x%8.8X\n",(int)session[scd].pCommandBdr);
-+	printf("\ttcd=%p\n",session[scd].tcd);
-+	printf("\tpCommandBdr=%p\n",session[scd].pCommandBdr);
- 	printf("\tpmlTrapsRegistered=%d\n",session[scd].pmlTrapsRegistered);
- 	printf("\tbitbucketSocket=%d\n",session[scd].bitbucketSocket);
- 
-@@ -2407,8 +2407,8 @@
- 	}
- 	printf("llioPossibleNameCount=%d\n",llioPossibleNameCount);
- 	printf("llioName=<%s>\n",SAFE_STRING(llioName));
--	printf("llioGlobBuffer.gl_pathc=%d\n",llioGlobBuffer.gl_pathc);
--	printf("llioGlobBuffer.gl_offs=%d\n",llioGlobBuffer.gl_offs);
-+	printf("llioGlobBuffer.gl_pathc=%lu\n",(unsigned long)llioGlobBuffer.gl_pathc);
-+	printf("llioGlobBuffer.gl_offs=%lu\n",(unsigned long)llioGlobBuffer.gl_offs);
- 	printf("llioGlobFlags=%d\n",llioGlobFlags);
- 	for (i=0;i<llioMatchDeviceIDCount;i++) {
- 		printf("llioMatchDeviceID[%d]=<%s>\n",i,
---- hpoj-0.91/mlcd/transport/ExTransport.cpp.gcc4	2005-03-04 14:00:57.000000000 +0000
-+++ hpoj-0.91/mlcd/transport/ExTransport.cpp	2005-03-04 14:03:37.000000000 +0000
-@@ -70,6 +70,7 @@
- 
- #ifdef JD_DEBUGLITE
- void ExLookup::dump(void) {
-+#if 0
- 	printf("sizeof(ExLookup)=%d, this=0x%8.8X\n",
- 		sizeof(ExLookup),(int)this);
- 	printf("pService=0x%8.8X\n",
-@@ -82,6 +83,7 @@
- 		lastSet);
- 	printf("status=%d\n",
- 		status);
-+#endif
- }
- void ExLookup__dump(ExLookup *_this) {
- 	return _this->dump();
-@@ -316,6 +318,7 @@
- 
- #ifdef JD_DEBUGLITE
- void ExTransportChannel::dump(void) {
-+#if 0
- 	printf("this=0x%8.8X\n",
- 		(int)this);
- 	printf("port=%d\n",
-@@ -378,6 +381,7 @@
- 		currentGrabbedCredit);
- 	printf("currentGrabbedTransaction=%d\n",
- 		currentGrabbedTransaction);
-+#endif
- }
- #endif
- 
-@@ -922,6 +926,7 @@
- #ifdef JD_DEBUGLITE
- 
- void ExTransport::dump(void) {
-+#if 0
- 	int channel;
- 
- 	printf("this=0x%8.8X\n",
-@@ -971,6 +976,7 @@
-     if (pLookupRequest) {
- 	pLookupRequest->dump();
-     }
-+#endif
- }
- 
- void ExTransport::dumpall(void) {
-@@ -1101,7 +1107,7 @@
- 	ExMsg *pMsg=pMgr->getFreeMsg();
- 
- 	pMsg->setType(eEXMSG_ACTIVATE_WAIT);
--	pMsg->setParams(eEXCLASS_TRANSPORT,(int)this);
-+	pMsg->setParams(eEXCLASS_TRANSPORT,(int)(long)this); // HACK
- 	pMsg->send(pMgr);
- }
- 
-@@ -1248,7 +1254,7 @@
- 	ExMsg *pMsg=pMgr->getFreeMsg();
- 
- 	pMsg->setType(eEXMSG_ACTIVATE_RESPONSE);
--	pMsg->setParams(eEXCLASS_TRANSPORT,(int)this,status);
-+	pMsg->setParams(eEXCLASS_TRANSPORT,(int)(long)this,status); // HACK
- 	pMsg->send(pMgr);
- }
- 
-@@ -1282,7 +1288,7 @@
- 	ExMsg *pMsg=pMgr->getFreeMsg();
- 
- 	pMsg->setType(eEXMSG_DEACTIVATE_RESPONSE);
--	pMsg->setParams(eEXCLASS_TRANSPORT,(int)this,status);
-+	pMsg->setParams(eEXCLASS_TRANSPORT,(int)(long)this,status); // HACK
- 	pMsg->send(pMgr);
- }
- 
---- hpoj-0.91/mlcd/transport/ExMlcTransport.cpp.gcc4	2005-03-04 14:28:28.000000000 +0000
-+++ hpoj-0.91/mlcd/transport/ExMlcTransport.cpp	2005-03-04 14:29:40.000000000 +0000
-@@ -409,6 +409,7 @@
- 
- #ifdef JD_DEBUGLITE
- void ExMlcTransportChannel::dump(void) {
-+#if 0
- 	ExTransportChannel::dump();
- 	printf("----------------\n");
- 	printf("pMlcTransport=0x%8.8X\n",
-@@ -487,6 +488,7 @@
- 		countHandleEmptyCreditRequestReply.get());
- 	printf("isGusher=%d\n",
- 		isGusher());
-+#endif
- }
- #endif
- 
-@@ -1597,6 +1599,7 @@
- 
- #ifdef JD_DEBUGLITE
- void ExMlcTransport::dump(void) {
-+#if 0
- 	int i;
- 
- 	ExTransport::dump();
-@@ -1631,6 +1634,7 @@
- 		remoteSocketArray[i].maxForwardPacketSize,
- 		remoteSocketArray[i].maxReversePacketSize);
-     }
-+#endif
- }
- #endif
- 
---- hpoj-0.91/mlcd/transport/ExMlcCommandChannel.cpp.gcc4	2005-03-04 14:37:19.000000000 +0000
-+++ hpoj-0.91/mlcd/transport/ExMlcCommandChannel.cpp	2005-03-04 14:37:46.000000000 +0000
-@@ -214,6 +214,7 @@
- 
- #ifdef JD_DEBUGLITE
- void ExMlcCommandChannel::dump(void) {
-+#if 0
- 	ExMlcTransportChannel::dump();
- 	printf("----------------\n");
- 	printf("pForwardCommandPool=0x%8.8X\n",
-@@ -238,6 +239,7 @@
- 		lastPsid);
- 	printf("lastSsid=%d\n",
- 		lastSsid);
-+#endif
- }
- #endif
- 
diff --git a/testing/hpoj/hpoj-kernel26.patch b/testing/hpoj/hpoj-kernel26.patch
deleted file mode 100644
index 38b8d0464..000000000
--- a/testing/hpoj/hpoj-kernel26.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- hpoj-0.91/scripts/ptal-init.in.kernel26	2004-03-03 17:30:47.000000000 +0000
-+++ hpoj-0.91/scripts/ptal-init.in	2004-03-03 17:30:59.000000000 +0000
-@@ -90,6 +90,11 @@
- my $varLock="/var/lock";
- my $varLockSubsys="$varLock/subsys";
- my $osPlatform=`uname -s 2>/dev/null`;
-+chomp $osPlatform;
-+my $linuxVersion=($osPlatform eq 'Linux' ? `uname -r 2>/dev/null` : '');
-+$linuxVersion=~s/^(\s*)(\d+\.\d+)(\..*)$/$2/;
-+chomp $linuxVersion;
-+my $usbprintermodule = ($linuxVersion eq '2.6' ? "usblp" : "printer");
- my %devnames;
- my %obsoleteDevnames;
- my %configInfo;
-@@ -1222,12 +1227,12 @@
- # undef -- skip USB probe
- # 0 -- do nothing, proceed with USB probe
- # >0 -- load printer.o
--# <0 -- disable and unload printer.o
-+# <0 -- disable and unload printer.o/usblp.o
- sub linuxWhatShouldWeDoAboutUsbPrinterModule {
- 	my $isSmp=&linuxIsSmp;
- 	my $libusbSupported=&ptalMlcdSupportsLibusb;
- 	my $usblpIsLoaded=&linuxUsblpIsLoaded;
--	my $printerIsLoaded=&linuxModuleIsLoaded("printer");
-+	my $printerIsLoaded=&linuxModuleIsLoaded($usbprintermodule);
- 
- 	# non-SMP:
- 	if (!$isSmp) {
-@@ -1261,9 +1266,10 @@
- 		}
- 		goto allowInsmodPrinter;
- 
--	# SMP, libusb support, some sort of printer.c functionality loaded:
-+	# SMP, libusb support, some sort of printer.c/usblp.c
-+	# functionality loaded:
- 	} elsif ($usblpIsLoaded) {
--	    # printer.c compiled into the kernel:
-+	    # printer.c/usblp.c compiled into the kernel:
- 	    if (!$printerIsLoaded) {
- 		if (!&askYN(
- "\n".
-@@ -1280,7 +1286,7 @@
- 			return undef;
- 		}
- 
--	    # printer.c compiled and loaded as a module:
-+	    # printer.c/usblp.c compiled and loaded as a module:
- 	    } else {
- promptDisableRmmodPrinter:
- 		my $r=&askYN(
-@@ -1301,8 +1307,9 @@
- 		}
- 	    }
- 
--	# SMP, libusb support, printer.c enabled although not loaded:
--	} elsif (!&linuxModuleIsDisabled("printer")) {
-+	# SMP, libusb support, printer.c/usblp.c enabled although not 
-+	# loaded:
-+	} elsif (!&linuxModuleIsDisabled($usbprintermodule)) {
- 		goto promptDisableRmmodPrinter;
- 	}
- 
-@@ -1326,11 +1333,11 @@
- 			return 1;
- 		}
- 		if ($r<0) {
--			$r=&linuxDisableAndUnloadModule("printer",
-+			$r=&linuxDisableAndUnloadModule($usbprintermodule,
- "to prevent possible system instability due to SMP+USB");
- 		} else {
- linuxJustLoad:
--			$r=&linuxInsmod("printer",$quiet);
-+			$r=&linuxInsmod($usbprintermodule,$quiet);
- 		}
- 		if (!$r && !$quiet &&
- 		    &askYN("\n*** Continue with the USB probe anyway".$msg,0)) {
-@@ -1601,7 +1608,7 @@
- 
-     } else {
- 	my $parModulesLoaded=0;
--	# Don't "modprobe printer" on SMP Linux with libusb support:
-+	# Don't "modprobe printer/usblp" on SMP Linux with libusb support:
- 	my $usbModulesLoaded=
- 		(&ptalMlcdSupportsLibusb &&
- 		 $osPlatform=~/Linux/ && &linuxIsSmp);
diff --git a/testing/hpoj/hpoj-pack.patch b/testing/hpoj/hpoj-pack.patch
deleted file mode 100644
index beb7040dc..000000000
--- a/testing/hpoj/hpoj-pack.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-There is a rather scary and longstanding GCC bug [1] which causes
-instant crashes if a program defines a struct with function-pointers
-and that structure happens to be "packed".  Why anybody would want to
-do such a thing is beyond me, but suffice it to say that hpoj v0.91 is
-doing precisely that.  The current Debian/sarge package for hpoj is
-definitely affected (any attempt to scan an image results in an
-instant crash).
-
-A patch to work around the problem is attached.
-
-Perhaps the hpoj developers can tell us whether it was really
-intentional to have the #pragma pack(1) span all of <stdlib.h> and
-<xform.h>?
-
-Thanks,
-
-	--david
-
-[1] http://gcc.gnu.org/bugzilla/show_bug.cgi?id=1844
-
---- hpoj-0.91/include/hpojip.h	2002-07-25 02:01:24.000000000 -0700
-+++ hpoj-0.91-davidm/include/hpojip.h	2004-11-11 21:19:58.775236374 -0800
-@@ -131,12 +132,15 @@
- 	float fl;
- } DWORD_OR_PVOID;
- 
-+#pragma pack ()
-+
- #ifdef HPOJIP_INTERNAL
- #include "../lib/hpojip/xform.h"   // this file uses the above definitions
- #else
- typedef struct IP_XFORM_TBL_s FAR *LPIP_XFORM_TBL;
- #endif
- 
-+#pragma pack (1)
- 
- /****************************************************************************\
-  ****************************************************************************
-@@ -587,8 +591,6 @@
- 
- EXPORT(WORD) ipGetFuncPtrs (LPIP_JUMP_TBL lpJumpTbl);
- 
--#pragma pack ()
--
- /****************************************************************************\
-  ****************************************************************************
-  *
-
-
--------------------------------------------------------
-This SF.Net email is sponsored by:
-Sybase ASE Linux Express Edition - download now for FREE
-LinuxWorld Reader's Choice Award Winner for best database on Linux.
-http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
-
-_______________________________________________
-hpoj-devel mailing list
-hpoj-devel@lists.sourceforge.net
-https://lists.sourceforge.net/lists/listinfo/hpoj-devel
diff --git a/testing/hpoj/hpoj.install b/testing/hpoj/hpoj.install
deleted file mode 100644
index acce9b033..000000000
--- a/testing/hpoj/hpoj.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-cat << EOF
-==> To get the HP-Officejet working run as root: ptal-init setup
-==> Add ptal-init to /etc/rc.conf daemon list and place it before cups is started!
-==> To access scanner enable in /etc/sane.d/dll.conf hpoj line.
-EOF
-}
diff --git a/testing/hpoj/hpoj0.91-snmp5.5.patch b/testing/hpoj/hpoj0.91-snmp5.5.patch
deleted file mode 100644
index 2042d6f1a..000000000
--- a/testing/hpoj/hpoj0.91-snmp5.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur hpoj-0.91-orig/lib/ptal/ptal-hpjd.c hpoj-0.91/lib/ptal/ptal-hpjd.c
---- hpoj-0.91-orig/lib/ptal/ptal-hpjd.c	2010-02-19 22:33:54.000000000 -0500
-+++ hpoj-0.91/lib/ptal/ptal-hpjd.c	2010-02-19 22:34:45.000000000 -0500
-@@ -45,6 +45,7 @@
- #include <stdlib.h>
- 
- #ifdef HAVE_SNMP
-+#include <net-snmp/net-snmp-config.h>
- #include <asn1.h>
- #include <snmp.h>
- #include <snmp_api.h>
diff --git a/testing/hpoj/hpoj_gcc43.diff b/testing/hpoj/hpoj_gcc43.diff
deleted file mode 100644
index 099c9d755..000000000
--- a/testing/hpoj/hpoj_gcc43.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nru --exclude changelog hpoj-0.91/mlcd/transport/ExMlcTransport.h hpoj-0.91/mlcd/transport/ExMlcTransport.h
---- hpoj-0.91/mlcd/transport/ExMlcTransport.h	2003-11-04 06:33:19.000000000 +0530
-+++ hpoj-0.91/mlcd/transport/ExMlcTransport.h	2008-03-20 10:14:02.000000000 +0530
-@@ -888,14 +888,14 @@
- 	void remsockReset(void);
-     public:
- 	STATUS remsockLookup(int socketID,int *pState,
--	    int *pMaxForwardPacketSize,int *pMaxForwardPacketSize);
-+	    int *pMaxForwardPacketSize,int *pMaxForwardPacketSize2);
- 	STATUS remsockAdd(int socketID);
- 	void handleConfigSocketReply(int result,int socketID,
- 	    int maxPriToSecPacketSize,int maxSecToPriPacketSize,
- 	    int statusLevel);
-     protected:
- 	STATUS remsockUpdate(int socketID,
--	    int maxForwardPacketSize,int maxForwardPacketSize);
-+	    int maxForwardPacketSize,int maxForwardPacketSize2);
- 	STATUS remsockDelete(int socketID);
- 
- 	// Peripheral-initiated opens (not supported):
diff --git a/testing/hugin/PKGBUILD b/testing/hugin/PKGBUILD
deleted file mode 100644
index 323525123..000000000
--- a/testing/hugin/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 138160 2011-09-17 21:02:50Z stephane $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Dominik Ryba <domryba@post.pl>
-
-pkgname=hugin
-pkgver=2011.0.0
-pkgrel=3
-pkgdesc="A frontend to the panorama-tools"
-arch=('i686' 'x86_64')
-url="http://hugin.sourceforge.net/"
-license=('LGPL')
-depends=('wxgtk' 'libpano13' 'boost-libs' 'enblend-enfuse' 'exiv2' 'openexr'
-         'autopano-sift-c' 'lapack' 'desktop-file-utils' 'make' 'perl-exiftool')
-makedepends=('zip' 'cmake' 'boost')
-install=hugin.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('ac8a129b4c3021233df6d9368c8164cf')
-sha1sums=('22e1ad3846291a9bbe58570683e213921a6f0116')
-
-build() {
-  cd "${srcdir}"
-  mkdir build && cd build
-  cmake "${srcdir}/${pkgname}-${pkgver}" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
-    -DENABLE_LAPACK=yes
-  make
-}
-
-package(){
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/hugin/hugin.install b/testing/hugin/hugin.install
deleted file mode 100644
index 362749233..000000000
--- a/testing/hugin/hugin.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
diff --git a/testing/inetutils/PKGBUILD b/testing/inetutils/PKGBUILD
deleted file mode 100644
index b667da6a9..000000000
--- a/testing/inetutils/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 140385 2011-10-11 22:49:21Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=inetutils
-pkgver=1.8
-pkgrel=6
-pkgdesc="A collection of common network programs"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/inetutils/"
-license=('GPL3')
-groups=('base')
-depends=('readline' 'ncurses' 'pam')
-provides=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
-conflicts=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
-replaces=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
-backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
-        'etc/xinetd.d/rexec' 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
-options=('!emptydirs')
-install=inetutils.install
-source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \
-        ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rexec.xinetd rlogin.xinetd rsh.xinetd \
-        dnsdomainname domainname)
-sha1sums=('598445859b511f73681e4d74a41d65cd6ae0f83e'
-          'c439b577214017be9cccd1b2fbba048964386a0e'
-          '84dc802b5e57b5e04c847572225a3b9612017155'
-          '68a590083b45997dfdb80e666b2de762f494ba74'
-          'bfad98a4a62f1fff8779f076c6019ed07f9111af'
-          '27d99b910eec0fc26bd79ccc2c1de26608330298'
-          '87aa4f38ebee9dac5dcaa04cbc3f2f0906bec605'
-          '81f10b3b688e3952f793b35bcef63b5bf257a92b'
-          '81f4a8da823cf0bb14284fc71ee6108849691eda'
-          'ac69756d6cc50157d430d863db04a5aac4688380'
-          'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \
-    --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \
-    --without-wrap --with-pam \
-    --enable-ftp --enable-ftpd \
-    --enable-telnet --enable-telnetd \
-    --enable-talk --enable-talkd \
-    --enable-rlogin --enable-rlogind \
-    --enable-rsh --enable-rshd \
-    --enable-rexec --enable-rexecd \
-    --enable-rcp --enable-hostname \
-    --disable-tftp --disable-tftpd \
-    --disable-ping --disable-ping6 \
-    --disable-logger --disable-syslogd \
-    --disable-inetd --disable-whois \
-    --disable-uucpd --disable-ifconfig --disable-traceroute
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -d "${pkgdir}/bin"
-  ln -s /usr/bin/hostname "${pkgdir}/bin/hostname"
-  install -D -m755 "${srcdir}/domainname" "${pkgdir}/bin/domainname"
-  install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname"
-  echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/domainname.1"
-  echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1"
-  install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd"
-  install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd"
-  install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet"
-  install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk"
-  install -D -m644 "${srcdir}/rexec.xinetd" "${pkgdir}/etc/xinetd.d/rexec"
-  install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"
-  install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh"
-}
diff --git a/testing/inetutils/dnsdomainname b/testing/inetutils/dnsdomainname
deleted file mode 100644
index 4bba209fe..000000000
--- a/testing/inetutils/dnsdomainname
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/hostname -y "$@"
diff --git a/testing/inetutils/domainname b/testing/inetutils/domainname
deleted file mode 100644
index a1b8a8c31..000000000
--- a/testing/inetutils/domainname
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/hostname -d "$@"
diff --git a/testing/inetutils/ftpd.conf b/testing/inetutils/ftpd.conf
deleted file mode 100644
index f660f0035..000000000
--- a/testing/inetutils/ftpd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to ftpd
-#
-FTPD_ARGS=""
diff --git a/testing/inetutils/ftpd.rc b/testing/inetutils/ftpd.rc
deleted file mode 100644
index 3d0d34421..000000000
--- a/testing/inetutils/ftpd.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ftpd
-
-PID=$(pidof -o %PPID /usr/sbin/ftpd)
-case "$1" in
-  start)
-    stat_busy "Starting ftpd"
-    [ -z "$PID" ] && /usr/sbin/ftpd -D $FTPD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ftpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ftpd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ftpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/inetutils/inetutils.install b/testing/inetutils/inetutils.install
deleted file mode 100644
index b338fa498..000000000
--- a/testing/inetutils/inetutils.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(inetutils.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/inetutils/rexec.xinetd b/testing/inetutils/rexec.xinetd
deleted file mode 100644
index 4659e4745..000000000
--- a/testing/inetutils/rexec.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service exec
-{
-        flags                   = REUSE
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/sbin/rexecd
-        log_on_failure          += USERID
-        disable                 = yes
-}
diff --git a/testing/inetutils/rlogin.xinetd b/testing/inetutils/rlogin.xinetd
deleted file mode 100644
index 5c72f86df..000000000
--- a/testing/inetutils/rlogin.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service login
-{
-        flags                   = REUSE
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/sbin/rlogind
-        log_on_failure          += USERID
-        disable                 = yes
-}
diff --git a/testing/inetutils/rsh.xinetd b/testing/inetutils/rsh.xinetd
deleted file mode 100644
index a13738c31..000000000
--- a/testing/inetutils/rsh.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service shell
-{
-        flags                   = REUSE
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/sbin/rshd
-        log_on_failure          += USERID
-        disable                 = yes
-}
diff --git a/testing/inetutils/talk.xinetd b/testing/inetutils/talk.xinetd
deleted file mode 100644
index 6abef359c..000000000
--- a/testing/inetutils/talk.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service ntalk
-{
-	flags			= REUSE
-	socket_type		= dgram
-	wait			= yes
-	user			= root
-	server			= /usr/sbin/talkd
-	log_on_failure		+= USERID
-	disable			= yes
-}
diff --git a/testing/inetutils/telnet.xinetd b/testing/inetutils/telnet.xinetd
deleted file mode 100644
index bd3a5e4b1..000000000
--- a/testing/inetutils/telnet.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service telnet
-{
-	flags			= REUSE
-	socket_type		= stream
-	wait			= no
-	user			= root
-	server			= /usr/sbin/telnetd
-	log_on_failure		+= USERID
-	disable			= yes
-}
diff --git a/testing/json-c/PKGBUILD b/testing/json-c/PKGBUILD
deleted file mode 100644
index 2f689ba64..000000000
--- a/testing/json-c/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-# Contributor: congyiwu <congyiwu AT gmail DOT com>
-pkgname=json-c
-pkgver=0.9
-pkgrel=1
-pkgdesc="A JSON implementation in C"
-url="http://oss.metaparadigm.com/json-c/"
-license=("MIT")
-arch=('i686' 'x86_64')
-depends=('glibc')
-source=(http://oss.metaparadigm.com/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('3a13d264528dcbaf3931b0cede24abae')
-options=(!libtool)
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/testing/json-glib/PKGBUILD b/testing/json-glib/PKGBUILD
deleted file mode 100644
index ed4bf7da2..000000000
--- a/testing/json-glib/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 138986 2011-09-28 19:32:07Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=json-glib
-pkgver=0.14.0
-pkgrel=1
-pkgdesc="JSON library built on GLib"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/JsonGlib"
-license=('GPL')
-depends=('glib2')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.14/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('821e90196673408a9293845e37ef572826a960a101096db9bcba45cf4c4afc56')
-
-build(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/koffice/PKGBUILD b/testing/koffice/PKGBUILD
deleted file mode 100644
index 0d1e3e5c5..000000000
--- a/testing/koffice/PKGBUILD
+++ /dev/null
@@ -1,301 +0,0 @@
-# $Id: PKGBUILD 138162 2011-09-17 21:02:54Z stephane $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
-
-pkgbase=koffice
-pkgname=(
-	'koffice-filters'
-	'koffice-interfaces'
-	'koffice-libs'
-	'koffice-plugins'
-	'koffice-pics'
-	'koffice-servicetypes'
-	'koffice-templates'
-	'koffice-tools'
-	'koffice-karbon'
-	'koffice-karbon-doc'
-#	'koffice-kchart'
-#	'koffice-kchart-doc'
-	'koffice-kexi'
-	'koffice-kexi-doc'
-	'koffice-kformula'
-	'koffice-kformula-doc'
-	'koffice-kounavail'
-	'koffice-kplato'
-#	'koffice-kplato-doc'
-	'koffice-kpresenter'
-	'koffice-kpresenter-doc'
-	'koffice-krita'
-#	'koffice-krita-doc' # no krita-doc anymore upstream
-	'koffice-kspread'
-	'koffice-kspread-doc'
-	'koffice-kword'
-#	'koffice-kword-doc' # see http://userbase.kde.org/KWord/Manual for documentation (not supplied by upstream anymore in the sources)
-	'koffice-handbook'
-	'koffice-thesaurus-doc'
-#	'koffice-kdgantt' # still an empty package
-)
-pkgver=2.3.3
-pkgrel=7
-arch=('i686' 'x86_64')
-url='http://koffice.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms'
-             'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd'
-             'libwpg' 'opengtl' 'libkdcraw')
-groups=('koffice')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2"
-        'kde4-koffice-libwpg02.patch' 'gcc46.patch')
-sha256sums=('31ba0d98c0d29c7b8ab97efdeb6c618b82177b2b0ec85da088178254da43c099'
-            '69106deb4081d71b5bd8f2e4f5af67ca689e4ce9f2bb49c11dbce5fb3409d612'
-            'e095c0b2bbedf41da6535a68b2275464dafd3f194566028d0135322f596e4739')
-
-build() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-
-	patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch"
-    patch -p1 -i "${srcdir}"/gcc46.patch
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-##### 1st package common files, depends, optdepends of the koffice applications #####
-
-package_koffice-filters(){
-	pkgdesc="Filters for the KDE office suite"
-    optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer'
-        'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter'
-        'libkdcraw: support for raw images')
-	install=filters.install
-        cd "${srcdir}/build/filters"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-interfaces(){
-	pkgdesc="Interfaces for the KDE office suite"
-	depends=('kdelibs' 'koffice-libs')
-	cd "${srcdir}/build/interfaces"
-	make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-libs(){
-	pkgdesc="Libs for the KDE office suite"
-	depends=('kdepimlibs' 'qca' 'lcms' 'koffice-servicetypes')
-        cd "${srcdir}/build/libs"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-plugins(){
-	pkgdesc="Plugins for the KDE office suite"
-	depends=('koffice-libs')
-	replaces=('koffice-kchart')
-	conflicts=('koffice-kchart')
-        cd "${srcdir}/build/plugins"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-pics(){
-	pkgdesc="Icons for the KDE office suite"
-	install=koffice.install
-        cd "${srcdir}/build/pics"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-servicetypes(){
-	pkgdesc="Servicetypes for the KDE office suite"
-        cd "${srcdir}/build/servicetypes"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-templates(){
-	pkgdesc="Templates for the KDE office suite"
-        cd "${srcdir}/build/templates"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-tools(){
-	pkgdesc="Tools for the KDE office suite"
-	depends=('koffice-libs')
-        cd "${srcdir}/build/tools"
-        make DESTDIR="${pkgdir}" install
-}
-
-#### package common files done #####
-
-#### package apps and their docs #####
-
-package_koffice-karbon(){
-	pkgdesc="Vector drawing application for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/karbon"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-karbon-doc(){
-	pkgdesc="Documentation for karbon"
-        cd "${srcdir}/build/doc/karbon"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kexi(){
-        pkgdesc="Integrated data management application for the KDE office suite"
-        depends=('kdelibs' 'koffice-libs' 'koffice-kspread' 'sqlite3')
-        cd "${srcdir}/build/kexi"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kexi-doc(){
-        pkgdesc="Documentation for kexi"
-        cd "${srcdir}/build/doc/kexi"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kformula(){
-        pkgdesc="Formula editor for the KDE office suite"
-		depends=('kdelibs' 'koffice-libs')
-        cd "${srcdir}/build/kformula"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kformula-doc() {
-	pkgdesc="Documentation for koffice-kformula"
-	cd "${srcdir}/build/doc/kformula"
-        make DESTDIR="${pkgdir}" install
-}
-
-
-package_koffice-kounavail(){
-	pkgdesc="Kounavail for the KDE office suite"
-	depends=('kdelibs' 'koffice-libs')
-        cd "${srcdir}/build/kounavail"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kplato(){
-	pkgdesc="Project management application for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs' 'kdepimlibs' 'koffice-templates' \
-		'koffice-plugins' 'koffice-kword')
-	install=koffice.install
-        cd "${srcdir}/build/kplato"
-        make DESTDIR="${pkgdir}" install
-}
-
-#package_koffice-kplato-doc(){
-#	pkgdesc="Documentation for kplato"
-#        cd ${srcdir}/build/doc/kplato
-#        make DESTDIR="${pkgdir}" install
-#}
-
-package_koffice-kpresenter(){
-	pkgdesc="Presentation tool for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kpresenter"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kpresenter-doc(){
-	pkgdesc="Documentation for kpresenter"
-        cd "${srcdir}/build/doc/kpresenter"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-krita(){
-	pkgdesc="Graphics editor for KDE"
-	depends=('hicolor-icon-theme' 'glew' 'qimageblitz' 'koffice-libs' \
-		'koffice-templates' 'koffice-plugins' 'poppler-qt' 'shared-mime-info' \
-		'openexr' 'opengtl')
-        optdepends=('koffice-filters: import/export filters')
-	install=krita.install
-        cd "${srcdir}/build/krita"
-        make DESTDIR="${pkgdir}" install
-}
-
-#package_koffice-krita-doc(){
-#	pkgdesc="Documentation for krita"
-#        cd ${srcdir}/build/doc/krita
-#        make DESTDIR="${pkgdir}" install
-#}
-
-
-package_koffice-kspread(){
-	pkgdesc="Spreadsheet application for KDE"
-	depends=('hicolor-icon-theme' 'gsl' 'koffice-libs' 'koffice-templates' 'koffice-plugins')
-	optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kspread"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kspread-doc(){
-	pkgdesc="Documentation for kspread"
-	cd "${srcdir}/build/doc/kspread"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-kword(){
-	pkgdesc="Wordprocessor for KDE"
-	depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates' 'koffice-pics' \
-		'koffice-kounavail' 'koffice-plugins')
-        optdepends=('koffice-filters: import/export filters')
-	install=koffice.install
-        cd "${srcdir}/build/kword"
-        make DESTDIR="${pkgdir}" install
-
-        # some sed lines to have python2 in extension scripts
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/oouno.py"
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/importdoxyxml.py"
-        sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}/usr/share/apps/kword/scripts/extensions/onlinehelp.py"
-}
-
-#package_koffice-kword-doc(){
-#	pkgdesc="Documentation for kword"
-#        cd ${srcdir}/build/doc/kword
-#        make DESTDIR="${pkgdir}" install
-#}
-
-##### package apps done #####
-
-#package_koffice-kchart(){
-#	pkgdesc="Charting tool for KDE"
-#	depends=('hicolor-icon-theme' 'koffice-interfaces' 'koffice-templates')
-#        optdepends=('koffice-filters: import/export filters')
-#	install=koffice.install
-#        cd "${srcdir}/build/kchart"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-#package_koffice-kchart-doc(){
-#	pkgdesc="Documentation for kchart"
-#        cd "${srcdir}/build/doc/kchart"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-#package_koffice-kdgantt(){
-#	pkgdesc="Gantt for KDE"
-#        cd "${srcdir}/build/kdgantt"
-#        make DESTDIR="${pkgdir}" install
-#}
-
-package_koffice-handbook() {
-	pkgdesc="Documentation for koffice"
-	cd "${srcdir}/build/doc/koffice"
-        make DESTDIR="${pkgdir}" install
-}
-
-package_koffice-thesaurus-doc(){
-	pkgdesc="Documentation for koffice-thesaurus"
-	cd "${srcdir}/build/doc/thesaurus"
-        make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/koffice/filters.install b/testing/koffice/filters.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/testing/koffice/filters.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/koffice/gcc46.patch b/testing/koffice/gcc46.patch
deleted file mode 100644
index dcf8a4f85..000000000
--- a/testing/koffice/gcc46.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46 koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc
---- koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc.gcc46	2011-02-17 06:13:40.000000000 -0600
-+++ koffice-2.3.2/krita/plugins/formats/exr/exr_converter.cc	2011-02-19 21:15:56.597142885 -0600
-@@ -80,6 +80,9 @@ ImageType imfTypeToKisType(Imf::PixelTyp
-         return IT_FLOAT16;
-     case Imf::FLOAT:
-         return IT_FLOAT32;
-+    default:
-+    // shouldn't reach here
-+        return IT_UNSUPPORTED;
-     }
- }
- 
-@@ -93,6 +96,9 @@ const KoColorSpace* kisTypeToColorSpace(
-     case IT_UNKNOWN:
-     case IT_UNSUPPORTED:
-         return 0;
-+    default:
-+    // shouldn't reach here
-+        return 0;
-     }
- }
- 
diff --git a/testing/koffice/kde4-koffice-libwpg02.patch b/testing/koffice/kde4-koffice-libwpg02.patch
deleted file mode 100644
index e2a55a216..000000000
--- a/testing/koffice/kde4-koffice-libwpg02.patch
+++ /dev/null
@@ -1,1323 +0,0 @@
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt
---- koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt	2011-01-18 07:40:25.000000000 +0100
-@@ -1,16 +1,11 @@
- 
--
- include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/)
- 
--set(wpgimport_PART_SRCS 
--WPGImport.cpp 
--OdgExporter.cxx
--FileOutputHandler.cxx
--GraphicsElement.cxx)
-+set(wpgimport_PART_SRCS WPGImport.cpp)
- 
- kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS})
- 
--target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES})
-+target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES})
- 
- install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,95 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "FileOutputHandler.hxx"
--
--FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) :
--	mbIsTagOpened(false),
--	mContentStream(contentStream)
--{
--}
--
--void FileOutputHandler::startDocument()
--{
--}
--
--void FileOutputHandler::startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList)
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--	mContentStream << "<" << psName;
--
--	for (std::vector<std::pair<std::string, std::string> >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++)
--	{
--		mContentStream << " " <<  (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\"";
--	}
--	mbIsTagOpened = true;
--	msOpenedTagName = psName;
--}
--
--void FileOutputHandler::endElement(const char *psName)
--{
--	if (mbIsTagOpened)
--	{
--		if( msOpenedTagName == psName )
--		{
--			mContentStream << "/>";
--			mbIsTagOpened = false;
--		}
--		else // should not happen, but handle it
--		{
--			mContentStream << ">";
--			mContentStream << "</" << psName << ">";
--			mbIsTagOpened = false;
--		}
--	}
--	else
--	{
--		mContentStream << "</" << psName << ">";
--		mbIsTagOpened = false;
--	}
--}
--
--void FileOutputHandler::characters(const std::string &sCharacters)
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--	mContentStream << sCharacters.c_str();
--}
--
--void FileOutputHandler::endDocument()
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,49 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef FILEOUTPUTHANDLER_H
--#define FILEOUTPUTHANDLER_H
--
--#include <iostream>
--#include <sstream>
--#include <string>
--#include "GraphicsHandler.hxx"
--
--class FileOutputHandler : public GraphicsHandler
--{
--  public:
--        explicit FileOutputHandler(std::ostringstream &contentStream);
--        virtual void startDocument();
--        virtual void endDocument();
--        virtual void startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList);
--        virtual void endElement(const char *psName);
--        virtual void characters(const std::string &sCharacters);
--
--  private:
--	bool mbIsTagOpened;
--	std::string msOpenedTagName;
--	std::ostringstream &mContentStream;
--};
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,66 +0,0 @@
--/* GraphicsElement: The items we are collecting to be put into the Writer
-- * document: paragraph and spans of text, as well as section breaks.
-- *
-- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
-- * 
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 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
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by 
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "GraphicsElement.hxx"
--#include "GraphicsHandler.hxx"
--#include <string.h>
--
--#define ASCII_SPACE 0x0020
--
--void TagGraphicsElement::print() const
--{
--}
--
--void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--	pHandler->startElement(getTagName().c_str(), maAttrList);
--}
--
--void OpenTagGraphicsElement::print() const
--{ 
--	TagGraphicsElement::print(); 	
--}
--
--void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue)
--{
--	std::pair<std::string, std::string> tmpAttribute;
--	tmpAttribute.first = szAttributeName;
--	tmpAttribute.second = sAttributeValue;
--        maAttrList.push_back(tmpAttribute);
--}
--
--void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--
--	pHandler->endElement(getTagName().c_str());
--}
--
--void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--	pHandler->characters(msData);
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,84 +0,0 @@
--/* GraphicsElement: The items we are collecting to be put into the Writer
-- * document: paragraph and spans of text, as well as section breaks.
-- *
-- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
-- * 
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 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
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpd.sourceforge.net
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by 
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef _GRAPHICSELEMENT_H
--#define _GRAPHICSELEMENT_H
--#include <string>
--#include <map>
--#include <vector>
--
--#include "GraphicsHandler.hxx"
--
--class GraphicsElement
--{
--public:	
--	virtual ~GraphicsElement() {}
--	virtual void write(GraphicsHandler *pHandler) const = 0;
--	virtual void print() const {}
--};
--
--class TagGraphicsElement : public GraphicsElement
--{
--public:
--	explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {}
--	const std::string &getTagName() const { return msTagName; }
--	virtual void print() const;
--private:
--	const std::string msTagName;
--};
--
--class OpenTagGraphicsElement : public TagGraphicsElement
--{
--public:
--	explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
--	~OpenTagGraphicsElement() {}
--	void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue);
--	virtual void write(GraphicsHandler *pHandler) const;
--	virtual void print () const;
--private:
--	std::vector<std::pair<std::string, std::string> > maAttrList;
--};
--
--class CloseTagGraphicsElement : public TagGraphicsElement
--{
--public:
--	explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
--	virtual void write(GraphicsHandler *pHandler) const;
--};
--
--class CharDataGraphicsElement : public GraphicsElement
--{
--public:
--	CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {}
--	virtual void write(GraphicsHandler *pHandler) const;
--private:
--	std::string msData;
--};
--
--
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,43 +0,0 @@
--/*
-- * Copyright (C) 2004 William Lachance (wlach@interlog.com)
-- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com)
-- *
-- * 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 Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- *  Contributor(s): Martin Gallwey (gallwey@sun.com)
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--#ifndef _GRAPHICSHANDLER_H
--#define _GRAPHICSHANDLER_H
--#include <string>
--#include <map>
--#include <vector>
--
--class GraphicsHandler
--{
--public:
--	virtual ~GraphicsHandler() {}
--        virtual void startDocument() = 0;
--        virtual void endDocument() = 0;
--        virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &xPropList) = 0;
--        virtual void endElement(const char *psName) = 0;
--        virtual void characters(const std::string &sCharacters) = 0;
--};
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,662 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "OdgExporter.hxx"
--#include "GraphicsElement.hxx"
--#include "GraphicsHandler.hxx"
--#include <locale.h>
--
--static std::string doubleToString(const double value)
--{
--  std::ostringstream tempStream;
--  tempStream << value;
--  std::string decimalPoint(localeconv()->decimal_point);
--  if ((decimalPoint.size() == 0) || (decimalPoint == "."))
--    return tempStream.str();
--  std::string stringValue(tempStream.str());
--  if (!stringValue.empty())
--  {
--    std::string::size_type pos;
--    while ((pos = stringValue.find(decimalPoint)) != std::string::npos)
--          stringValue.replace(pos,decimalPoint.size(),".");
--  }
--  return stringValue;
--}
--
--
--OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML):
--        mpHandler(pHandler),
--        m_fillRule(AlternatingFill),
--        m_gradientIndex(1),
--        m_dashIndex(1),
--        m_styleIndex(1),
--        m_width(0.0f),
--        m_height(0.0f),
--        m_isFlatXML(isFlatXML)
--{
--}
--
--OdgExporter::~OdgExporter()
--{
--        for (std::vector <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin();
--                iterStroke != mStrokeDashElements.end(); iterStroke++)
--                delete (*iterStroke);
--
--        for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin();
--                iterGradient != mGradientElements.end(); iterGradient++)
--                delete (*iterGradient);
--
--        for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
--                iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
--                delete (*iterAutomaticStyles);
--
--        for (std::vector<GraphicsElement *>::iterator bodyIter = mBodyElements.begin();
--                bodyIter != mBodyElements.end(); bodyIter++)
--                delete (*bodyIter);
--}
--
--void OdgExporter::startGraphics(double width, double height)
--{
--        m_gradientIndex = 1;
--        m_dashIndex = 1;
--        m_styleIndex = 1;
--        m_width = width;
--        m_height = height;
--
--
--        mpHandler->startDocument();
--        OpenTagGraphicsElement tmpOfficeDocumentContent("office:document");
--        tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/");
--        tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office");
--        tmpOfficeDocumentContent.addAttribute("office:version", "1.0");
--        if (m_isFlatXML)
--                        tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing");
--        tmpOfficeDocumentContent.write(mpHandler);
--
--        OpenTagGraphicsElement("office:settings").write(mpHandler);
--
--        OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set");
--        configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings");
--        configItemSetOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement configItemOpenElement1("config:config-item");
--        configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop");
--        configItemOpenElement1.addAttribute("config:type", "int");
--        configItemOpenElement1.write(mpHandler);
--        mpHandler->characters("0");
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement2("config:config-item");
--        configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft");
--        configItemOpenElement2.addAttribute("config:type", "int");
--        configItemOpenElement2.write(mpHandler);
--        mpHandler->characters("0");
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement3("config:config-item");
--        configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth");
--        configItemOpenElement3.addAttribute("config:type", "int");
--        configItemOpenElement3.write(mpHandler);
--        m_value.str("");
--        m_value << (unsigned)(2540 * width);
--        mpHandler->characters(m_value.str());
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement4("config:config-item");
--        configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight");
--        configItemOpenElement4.addAttribute("config:type", "int");
--        configItemOpenElement4.write(mpHandler);
--        m_value.str("");
--        m_value << (unsigned)(2540 * height);
--        mpHandler->characters(m_value.str());
--        mpHandler->endElement("config:config-item");
--
--        mpHandler->endElement("config:config-item-set");
--
--        mpHandler->endElement("office:settings");
--
--}
--
--void OdgExporter::endGraphics()
--{
--        OpenTagGraphicsElement("office:styles").write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin();
--                iterStroke != mStrokeDashElements.end(); iterStroke++)
--                (*iterStroke)->write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterGradient = mGradientElements.begin();
--                iterGradient != mGradientElements.end(); iterGradient++)
--                (*iterGradient)->write(mpHandler);
--
--        mpHandler->endElement("office:styles");
--
--        OpenTagGraphicsElement("office:automatic-styles").write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
--                iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
--                (*iterAutomaticStyles)->write(mpHandler);
--
--        OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout");
--        tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0");
--        tmpStylePageLayoutOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in");
--        m_value.str("");
--        m_value <<  doubleToString(m_width) << "in";
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(m_height)  << "in";
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str());
--        m_value.str("");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait");
--        tmpStylePageLayoutPropertiesOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:page-layout-properties");
--
--        mpHandler->endElement("style:page-layout");
--
--        OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style");
--        tmpStyleStyleOpenElement.addAttribute("style:name", "dp1");
--        tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page");
--        tmpStyleStyleOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties");
--        // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border");
--        tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none");
--        tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:drawing-page-properties");
--
--        mpHandler->endElement("style:style");
--
--        mpHandler->endElement("office:automatic-styles");
--
--        OpenTagGraphicsElement("office:master-styles").write(mpHandler);
--
--        OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page");
--        tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default");
--        tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0");
--        tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1");
--        tmpStyleMasterPageOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:master-page");
--
--        mpHandler->endElement("office:master-styles");
--
--        OpenTagGraphicsElement("office:body").write(mpHandler);
--
--        OpenTagGraphicsElement("office:drawing").write(mpHandler);
--
--        OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page");
--        tmpDrawPageOpenElement.addAttribute("draw:name", "page1");
--        tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1");
--        tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default");
--        tmpDrawPageOpenElement.write(mpHandler);
--
--        for (std::vector<GraphicsElement *>::const_iterator bodyIter = mBodyElements.begin();
--                bodyIter != mBodyElements.end(); bodyIter++)
--        {
--                (*bodyIter)->write(mpHandler);
--        }
--
--        mpHandler->endElement("draw:page");
--        mpHandler->endElement("office:drawing");
--        mpHandler->endElement("office:body");
--        mpHandler->endElement("office:document");
--
--        mpHandler->endDocument();
--}
--
--void OdgExporter::setPen(const libwpg::WPGPen& pen)
--{
--        m_pen = pen;
--}
--
--void OdgExporter::setBrush(const libwpg::WPGBrush& brush)
--{
--        m_brush = brush;
--}
--
--void OdgExporter::setFillRule(FillRule rule)
--{
--        m_fillRule = rule;
--}
--
--void OdgExporter::startLayer(unsigned int)
--{
--}
--
--void OdgExporter::endLayer(unsigned int)
--{
--}
--
--void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double )
--{
--        writeStyle();
--        OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawRectElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.x1) << "in";
--        pDrawRectElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.y1) << "in";
--        pDrawRectElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.x2-rect.x1) << "in";
--        pDrawRectElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.y2-rect.y1) << "in";
--        pDrawRectElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rx) << "in";
--        // FIXME: what to do when rx != ry ?
--        pDrawRectElement->addAttribute("draw:corner-radius", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawRectElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:rect")));
--}
--
--void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry)
--{
--        writeStyle();
--        OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawEllipseElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(center.x - rx) << "in";
--        pDrawEllipseElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(center.y - ry) << "in";
--        pDrawEllipseElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(2 * rx) << "in";
--        pDrawEllipseElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(2 * ry) << "in";
--        pDrawEllipseElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawEllipseElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:ellipse")));
--}
--
--void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices)
--{
--        if(vertices.count() < 2)
--                return;
--
--        if(vertices.count() == 2)
--        {
--                const libwpg::WPGPoint& p1 = vertices[0];
--                const libwpg::WPGPoint& p2 = vertices[1];
--
--                writeStyle();
--                OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line");
--                m_value.str("");
--                m_value << "gr" << m_styleIndex-1;
--                pDrawLineElement->addAttribute("draw:style-name", m_value.str());
--                m_value.str("");
--                pDrawLineElement->addAttribute("draw:text-style-name", "P1");
--                pDrawLineElement->addAttribute("draw:layer", "layout");
--                m_value << doubleToString(p1.x)  << "in";
--                pDrawLineElement->addAttribute("svg:x1", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(p1.y)  << "in";
--                pDrawLineElement->addAttribute("svg:y1", m_value.str());
--                m_value.str("");
--                m_value  << doubleToString(p2.x)  << "in";
--                pDrawLineElement->addAttribute("svg:x2", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(p2.y)  << "in";
--                pDrawLineElement->addAttribute("svg:y2", m_value.str());
--                m_value.str("");
--                mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawLineElement));
--                mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:line")));
--        }
--        else
--        {
--                // draw as path
--                libwpg::WPGPath path;
--                path.moveTo(vertices[0]);
--                for(unsigned long ii = 1; ii < vertices.count(); ii++)
--                        path.lineTo(vertices[ii]);
--                path.closed = true;
--                drawPath(path);
--        }
--}
--
--void OdgExporter::drawPath(const libwpg::WPGPath& path)
--{
--        if(path.count() == 0)
--                return;
--
--        // try to find the bounding box
--        // this is simple convex hull technique, the bounding box might not be
--        // accurate but that should be enough for this purpose
--        libwpg::WPGPoint p = path.element(0).point;
--        libwpg::WPGPoint q = path.element(0).point;
--        for(unsigned k = 0; k < path.count(); k++)
--        {
--                libwpg::WPGPathElement element = path.element(k);
--                p.x = (p.x > element.point.x) ? element.point.x : p.x;
--                p.y = (p.y > element.point.y) ? element.point.y : p.y;
--                q.x = (q.x < element.point.x) ? element.point.x : q.x;
--                q.y = (q.y < element.point.y) ? element.point.y : q.y;
--                if(element.type == libwpg::WPGPathElement::CurveToElement)
--                {
--                        p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x;
--                        p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y;
--                        q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x;
--                        q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y;
--                        p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x;
--                        p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y;
--                        q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x;
--                        q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y;
--                }
--        }
--        double vw = q.x - p.x;
--        double vh = q.y - p.y;
--
--        writeStyle();
--
--        OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawPathElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        pDrawPathElement->addAttribute("draw:text-style-name", "P1");
--        pDrawPathElement->addAttribute("draw:layer", "layout");
--        m_value << doubleToString(p.x)  << "in";
--        pDrawPathElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(p.y)  << "in";
--        pDrawPathElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(vw) << "in";
--        pDrawPathElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(vh) << "in";
--        pDrawPathElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540);
--        pDrawPathElement->addAttribute("svg:viewBox", m_value.str());
--        m_value.str("");
--
--        for(unsigned i = 0; i < path.count(); i++)
--        {
--                libwpg::WPGPathElement element = path.element(i);
--                libwpg::WPGPoint point = element.point;
--                switch(element.type)
--                {
--                        // 2540 is 2.54*1000, 2.54 in = 1 in
--                        case libwpg::WPGPathElement::MoveToElement:
--                                m_value << "M" << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        case libwpg::WPGPathElement::LineToElement:
--                                m_value << "L" << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        case libwpg::WPGPathElement::CurveToElement:
--                                m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " ";
--                                m_value << (int)((element.extra1.y-p.y)*2540) << " ";
--                                m_value << (int)((element.extra2.x-p.x)*2540) << " ";
--                                m_value << (int)((element.extra2.y-p.y)*2540) << " ";
--                                m_value << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        default:
--                                break;
--                }
--        }
--        if(path.closed)
--                m_value << " Z";
--        pDrawPathElement->addAttribute("svg:d", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawPathElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:path")));
--}
--
--
--void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap)
--{
--        OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.x1) << "in";
--        pDrawFrameElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.y1) << "in";
--        pDrawFrameElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.height()) << "in";
--        pDrawFrameElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.width()) << "in";
--        pDrawFrameElement->addAttribute("svg:width", m_value.str());
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
--
--        libwpg::WPGString base64Binary;
--        bitmap.generateBase64DIB(base64Binary);
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
--}
--
--void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData)
--{
--        if (binaryData.mimeType.length() <= 0)
--                return;
--        OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.x1) << "in";
--        pDrawFrameElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.y1) << "in";
--        pDrawFrameElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.height()) << "in";
--        pDrawFrameElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.width()) << "in";
--        pDrawFrameElement->addAttribute("svg:width", m_value.str());
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
--
--        libwpg::WPGString base64Binary = binaryData.getBase64Data();
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
--}
--
--
--static std::string colorToHex(const libwpg::WPGColor& color)
--{
--        char hexdigits[] = "0123456789abcdef";
--        char buffer[] = "123456";
--        buffer[0] = hexdigits[(color.red >> 4) & 15];
--        buffer[1] = hexdigits[color.red & 15];
--        buffer[2] = hexdigits[(color.green >> 4) & 15];
--        buffer[3] = hexdigits[color.green & 15];
--        buffer[4] = hexdigits[(color.blue >> 4) & 15];
--        buffer[5] = hexdigits[color.blue & 15];
--        return std::string(buffer);
--}
--
--void OdgExporter::writeStyle()
--{
--        m_value.str("");
--        m_name.str("");
--
--        if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) )
--        {
--                // ODG only supports dashes with the same length of spaces inbetween
--                // here we take the first space and assume everything else the same
--                // note that dash length is written in percentage
--                double distance = m_pen.dashArray.at(1);
--                OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash");
--                tmpDrawStrokeDashElement->addAttribute("draw:style", "rect");
--                m_value << "Dash_" << m_dashIndex++;
--                tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(distance*100) << "%";
--                tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str());
--                m_value.str("");
--                for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++)
--                {
--                        m_name << "draw:dots" << i+1;
--                        tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1");
--                        m_name.str("");
--                        m_name << "draw:dots" << i+1 << "-length";
--                        m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%";
--                        tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str());
--                        m_name.str("");
--                        m_value.str("");
--                }
--                mStrokeDashElements.push_back(static_cast<GraphicsElement *>(tmpDrawStrokeDashElement));
--                mStrokeDashElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:stroke-dash")));
--        }
--
--        if(m_brush.style == libwpg::WPGBrush::Gradient)
--        {
--                OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient");
--                tmpDrawGradientElement->addAttribute("draw:style", "linear");
--                m_value << "Gradient_" << m_gradientIndex++;
--                tmpDrawGradientElement->addAttribute("draw:name", m_value.str());
--                m_value.str("");
--
--                // ODG angle unit is 0.1 degree
--                double angle = -m_brush.gradient.angle();
--                while(angle < 0)
--                        angle += 360;
--                while(angle > 360)
--                        angle -= 360;
--
--                m_value << (unsigned)(angle*10);
--                tmpDrawGradientElement->addAttribute("draw:angle", m_value.str());
--                m_value.str("");
--
--                libwpg::WPGColor startColor = m_brush.gradient.stopColor(0);
--                libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1);
--                m_value << "#" << colorToHex(startColor);
--                tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str());
--                m_value.str("");
--                m_value << "#" << colorToHex(stopColor);
--                tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str());
--                m_value.str("");
--                tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%");
--                tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%");
--                tmpDrawGradientElement->addAttribute("draw:border", "0%");
--                mGradientElements.push_back(static_cast<GraphicsElement *>(tmpDrawGradientElement));
--                mGradientElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:gradient")));
--        }
--
--        OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style");
--        m_value << "gr" << m_styleIndex;
--        tmpStyleStyleElement->addAttribute("style:name", m_value.str());
--        m_value.str("");
--        tmpStyleStyleElement->addAttribute("style:family", "graphic");
--        tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard");
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleStyleElement));
--
--        OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties");
--
--        if(m_pen.width > 0.0)
--        {
--                m_value << doubleToString(m_pen.width) << "in";
--                tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str());
--                m_value.str("");
--                m_value << "#" << colorToHex(m_pen.foreColor);
--                tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str());
--                m_value.str("");
--
--                if(!m_pen.solid)
--                {
--                        tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash");
--                        m_value << "Dash_" << m_dashIndex-1;
--                        tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str());
--                        m_value.str("");
--                }
--        }
--        else
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none");
--
--        if(m_brush.style == libwpg::WPGBrush::NoBrush)
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none");
--
--        if(m_brush.style == libwpg::WPGBrush::Solid)
--        {
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid");
--                m_value << "#" << colorToHex(m_brush.foreColor);
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str());
--                m_value.str("");
--        }
--
--        if(m_brush.style == libwpg::WPGBrush::Gradient)
--        {
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient");
--                m_value << "Gradient_" << m_gradientIndex-1;
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str());
--                m_value.str("");
--        }
--
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleGraphicPropertiesElement));
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties")));
--
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:style")));
--        m_styleIndex++;
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,116 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef __ODGEXPORTER_H__
--#define __ODGEXPORTER_H__
--
--#include <iostream>
--#include <sstream>
--#include <string>
--
--#include <libwpg/libwpg.h>
--#include "GraphicsElement.hxx"
--
--class OdgExporter : public libwpg::WPGPaintInterface {
--public:
--	explicit OdgExporter(GraphicsHandler *pHandler,
--			     const bool isFlatXML = false);
--	~OdgExporter();
--
--#if LIBWPG_VERSION_MINOR<2
--	void startGraphics(double imageWidth, double imageHeight);
--	void endGraphics();
--	void startLayer(unsigned int id);
--	void endLayer(unsigned int id);
--
--	void setPen(const libwpg::WPGPen& pen);
--	void setBrush(const libwpg::WPGBrush& brush);
--	void setFillRule(FillRule rule);
--
--	void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry);
--	void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry);
--	void drawPolygon(const libwpg::WPGPointArray& vertices);
--	void drawPath(const libwpg::WPGPath& path);
--	void drawBitmap(const libwpg::WPGBitmap& bitmap);
--	void drawImageObject(const libwpg::WPGBinaryData& binaryData);
--
--private:
--	std::vector <GraphicsElement *> mBodyElements;
--	std::vector <GraphicsElement *> mAutomaticStylesElements;
--	std::vector <GraphicsElement *> mStrokeDashElements;
--	std::vector <GraphicsElement *> mGradientElements;
--	GraphicsHandler *mpHandler;
--
--	libwpg::WPGPen m_pen;
--	libwpg::WPGBrush m_brush;
--	FillRule m_fillRule;
--	int m_gradientIndex;
--	int m_dashIndex;
--	int m_styleIndex;
--	void writeStyle();
--	std::ostringstream m_value, m_name;
--	double m_width, m_height;
--	const bool m_isFlatXML;
--#else
--	virtual void startGraphics(const ::WPXPropertyList &propList);
--	virtual void endGraphics();
--	virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient);
--	virtual void startLayer(const ::WPXPropertyList &propList);
--	virtual void endLayer();
--	virtual void drawRectangle(const ::WPXPropertyList& propList);
--	virtual void drawEllipse(const ::WPXPropertyList& propList);
--	virtual void drawPolygon(const ::WPXPropertyListVector &vertices);
--	virtual void drawPath(const ::WPXPropertyListVector &path);
--	virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData);
--	virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList);
--	virtual void endEmbeddedGraphics();
--	virtual void drawPolyline(const ::WPXPropertyListVector &vertices);
--	virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path);
--	virtual void endTextObject();
--	virtual void startTextLine(const ::WPXPropertyList &propList);
--	virtual void endTextLine();
--	virtual void startTextSpan(const ::WPXPropertyList &propList);
--	virtual void endTextSpan();
--	virtual void insertText(const ::WPXString &str);
--
--
--private:
--	std::vector <GraphicsElement *> mBodyElements;
--	std::vector <GraphicsElement *> mAutomaticStylesElements;
--	std::vector <GraphicsElement *> mStrokeDashElements;
--	std::vector <GraphicsElement *> mGradientElements;
--	GraphicsHandler *mpHandler;
--
--	int m_gradientIndex;
--	int m_dashIndex;
--	int m_styleIndex;
--	void writeStyle();
--	std::ostringstream m_value, m_name;
--	double m_width, m_height;
--	const bool m_isFlatXML;
--#endif
--};
--
--#endif // __ODGEXPORTER_H__
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp
---- koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp	2011-01-02 17:46:15.000000000 +0100
-@@ -20,28 +20,26 @@
- #include <WPGImport.h>
- #include <WPGImport.moc>
- 
--#include <QBuffer>
--#include <QByteArray>
--#include <QString>
--
--#include <kdebug.h>
- #include <KoFilterChain.h>
- #include <KoGlobal.h>
- #include <KoUnit.h>
-+#include <KoXmlWriter.h>
-+
- #include <kpluginfactory.h>
-+#include <KDebug>
- 
--#include <KoXmlWriter.h>
-+
-+#include <QtCore/QString>
-+#include <QtCore/QFile>
- 
- #include <libwpg/libwpg.h>
- #if LIBWPG_VERSION_MINOR<2
- #include <libwpg/WPGStreamImplementation.h>
- #else
- #include <libwpd-stream/libwpd-stream.h>
-+#include <libwpd/libwpd.h>
- #endif
- 
--#include "FileOutputHandler.hxx"
--#include "OdgExporter.hxx"
--
- #include <iostream>
- 
- K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
-@@ -56,35 +54,13 @@
- {
- }
- 
--static QByteArray createManifest()
--{
--    KoXmlWriter* manifestWriter;
--    QByteArray manifestData;
--    QBuffer manifestBuffer(&manifestData);
--
--    manifestBuffer.open(QIODevice::WriteOnly);
--    manifestWriter = new KoXmlWriter(&manifestBuffer);
--
--    manifestWriter->startDocument("manifest:manifest");
--    manifestWriter->startElement("manifest:manifest");
--    manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0");
--    manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics");
--    //manifestWriter->addManifestEntry( "styles.xml", "text/xml" );
--    manifestWriter->addManifestEntry("content.xml", "text/xml");
--    manifestWriter->endElement();
--    manifestWriter->endDocument();
--    delete manifestWriter;
--
--    return manifestData;
--}
--
- 
- KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to)
- {
-     if (from != "application/x-wpg")
-         return KoFilter::NotImplemented;
- 
--    if (to != "application/vnd.oasis.opendocument.graphics")
-+    if (to != "image/svg+xml")
-         return KoFilter::NotImplemented;
- 
- #if LIBWPG_VERSION_MINOR<2
-@@ -96,6 +72,7 @@
-             input = olestream;
-         }
-     }
-+    libwpg::WPGString output;
- #else
-     WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
-     if (input->isOLEStream()) {
-@@ -105,59 +82,31 @@
-             input = olestream;
-         }
-      }
-+     ::WPXString output;
- #endif
- 
-     if (!libwpg::WPGraphics::isSupported(input)) {
--        std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl;
-+        kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!";
-         delete input;
-         return KoFilter::NotImplemented;
-     }
- 
--    // do the conversion
--    std::ostringstream tmpStringStream;
--    FileOutputHandler tmpHandler(tmpStringStream);
--    OdgExporter exporter(&tmpHandler);
--    libwpg::WPGraphics::parse(input, &exporter);
--    delete input;
--
--
--    // create output store
--    KoStore* storeout;
--    storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write,
--                                    "application/vnd.oasis.opendocument.graphics", KoStore::Zip);
--
--    if (!storeout) {
--        kWarning() << "Couldn't open the requested file.";
--        return KoFilter::FileNotFound;
--    }
--
--#if 0
--    if (!storeout->open("styles.xml")) {
--        kWarning() << "Couldn't open the file 'styles.xml'.";
--        return KoFilter::CreationError;
-+    if (!libwpg::WPGraphics::generateSVG(input, output)) {
-+        kWarning() << "ERROR: SVG Generation failed!";
-+        delete input;
-+        return KoFilter::ParsingError;
-     }
--    //storeout->write( createStyles() );
--    storeout->close();
--#endif
- 
--    if (!storeout->open("content.xml")) {
--        kWarning() << "Couldn't open the file 'content.xml'.";
--        return KoFilter::CreationError;
--    }
--    storeout->write(tmpStringStream.str().c_str());
--    storeout->close();
-+    delete input;
- 
--    // store document manifest
--    storeout->enterDirectory("META-INF");
--    if (!storeout->open("manifest.xml")) {
--        kWarning() << "Couldn't open the file 'META-INF/manifest.xml'.";
--        return KoFilter::CreationError;
-+    QFile outputFile(m_chain->outputFile());
-+    if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-+        kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
-+        return KoFilter::InternalError;
-     }
--    storeout->write(createManifest());
--    storeout->close();
- 
--    // we are done!
--    delete storeout;
-+    outputFile.write(output.cstr());
-+    outputFile.close();
- 
-     return KoFilter::OK;
- }
-
diff --git a/testing/koffice/koffice.install b/testing/koffice/koffice.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/koffice/koffice.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/koffice/krita.install b/testing/koffice/krita.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/testing/koffice/krita.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
-\ No newline at end of file
diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD
deleted file mode 100644
index ade7ee1d7..000000000
--- a/testing/krb5/PKGBUILD
+++ /dev/null
@@ -1,85 +0,0 @@
-# $Id: PKGBUILD 139515 2011-10-02 20:46:35Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=krb5
-pkgver=1.9.1
-pkgrel=4
-pkgdesc="The Kerberos network authentication system"
-arch=('i686' 'x86_64')
-url="http://web.mit.edu/kerberos/"
-license=('custom')
-depends=('e2fsprogs' 'libldap' 'keyutils')
-makedepends=('perl')
-provides=('heimdal')
-replaces=('heimdal')
-conflicts=('heimdal')
-backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
-source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
-        krb5-kadmind
-        krb5-kdc
-        krb5-1.9.1-config-script.patch
-        krb5-1.9.1-canonicalize-fallback.patch)
-sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
-          '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
-          '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
-          '7342410760cf44bfa01bb99bb4c49e12496cb46f'
-          '238c268fa6cb42fc7324ab54db9abda5cd77f833')
-options=('!emptydirs')
-
-build() {
-   tar zxvf ${pkgname}-${pkgver}.tar.gz
-   cd "${srcdir}/${pkgname}-${pkgver}/src"
-
-   # - Make krb5-config suppress CFLAGS output when called with --libs
-   #   cf https://bugzilla.redhat.com/show_bug.cgi?id=544391
-   #
-   # - Omit extra libraries because their interfaces are not exposed to applications
-   #   by libkrb5, unless do_deps is set to 1, which indicates that the caller
-   #   wants the whole list.
-   #
-   #   Patch from upstream : 
-   #   http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236
-   patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch
-
-   # FS#25515
-   patch -Np2 -i ${srcdir}/krb5-1.9.1-canonicalize-fallback.patch
-
-   # FS#25384
-   sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
-
-   export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
-   export CPPFLAGS+=" -I/usr/include/et"
-   ./configure --prefix=/usr \
-               --mandir=/usr/share/man \
-               --localstatedir=/var/lib \
-               --enable-shared \
-               --with-system-et \
-               --with-system-ss \
-               --disable-rpath \
-               --without-tcl \
-               --enable-dns-for-realm \
-               --with-ldap
-   make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}/src"
-   make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install
-
-   # Sample KDC config file
-   install -dm 755 "${pkgdir}"/var/lib/krb5kdc
-   install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf
-
-   # Default configuration file
-   install -dm 755 "${pkgdir}"/etc
-   install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
-
-   install -dm 755 "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kadmind  "${pkgdir}"/etc/rc.d
-
-   install -dm 755 "${pkgdir}"/usr/share/aclocal
-   install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal
-
-   install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch b/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch
deleted file mode 100644
index e5a38498f..000000000
--- a/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c krb5-1.9.1/src/lib/krb5/krb/get_creds.c
---- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c	2011-02-09 16:55:36.000000000 -0500
-+++ krb5-1.9.1/src/lib/krb5/krb/get_creds.c	2011-09-26 18:42:01.465190278 -0400
-@@ -470,13 +470,10 @@
- 
- /***** STATE_REFERRALS *****/
- 
--/*
-- * Possibly retry a request in the fallback realm after a referral request
-- * failure in the local realm.  Expects ctx->reply_code to be set to the error
-- * from a referral request.
-- */
-+/* Possibly try a non-referral request after a referral request failure.
-+ * Expects ctx->reply_code to be set to the error from a referral request. */
- static krb5_error_code
--try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx)
-+try_fallback(krb5_context context, krb5_tkt_creds_context ctx)
- {
-     krb5_error_code code;
-     char **hrealms;
-@@ -485,9 +482,10 @@
-     if (ctx->referral_count > 1)
-         return ctx->reply_code;
- 
--    /* Only fall back if the original request used the referral realm. */
-+    /* If the request used a specified realm, make a non-referral request to
-+     * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */
-     if (!krb5_is_referral_realm(&ctx->req_server->realm))
--        return ctx->reply_code;
-+        return begin_non_referral(context, ctx);
- 
-     if (ctx->server->length < 2) {
-         /* We need a type/host format principal to find a fallback realm. */
-@@ -500,10 +498,10 @@
-     if (code != 0)
-         return code;
- 
--    /* Give up if the fallback realm isn't any different. */
-+    /* If the fallback realm isn't any different, use the existing TGT. */
-     if (data_eq_string(ctx->server->realm, hrealms[0])) {
-         krb5_free_host_realm(context, hrealms);
--        return ctx->reply_code;
-+        return begin_non_referral(context, ctx);
-     }
- 
-     /* Rewrite server->realm to be the fallback realm. */
-@@ -540,9 +538,9 @@
-     krb5_error_code code;
-     const krb5_data *referral_realm;
- 
--    /* Possibly retry with the fallback realm on error. */
-+    /* Possibly try a non-referral fallback request on error. */
-     if (ctx->reply_code != 0)
--        return try_fallback_realm(context, ctx);
-+        return try_fallback(context, ctx);
- 
-     if (krb5_principal_compare(context, ctx->reply_creds->server,
-                                ctx->server)) {
diff --git a/testing/krb5/krb5-1.9.1-config-script.patch b/testing/krb5/krb5-1.9.1-config-script.patch
deleted file mode 100644
index a72a75edf..000000000
--- a/testing/krb5/krb5-1.9.1-config-script.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in
---- krb5-1.9.1.ori/src/krb5-config.in	2010-01-19 13:44:57.000000000 -0500
-+++ krb5-1.9.1/src/krb5-config.in	2011-09-26 18:27:09.018487087 -0400
-@@ -186,7 +186,7 @@
- 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
- 	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
- 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
--	    -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
-+	    -e 's#\$(CFLAGS)##'`
- 
-     if test $library = 'kdb'; then
- 	lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
-@@ -214,9 +214,13 @@
-     fi
- 
-     if test $library = 'krb5'; then
--	lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
-+	lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err"
-     fi
- 
-+    # If we ever support a flag to generate output suitable for static
-+    # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB"
-+    # here.
-+
-     echo $lib_flags
- fi
- 
diff --git a/testing/krb5/krb5-kadmind b/testing/krb5/krb5-kadmind
deleted file mode 100644
index 04df0dcff..000000000
--- a/testing/krb5/krb5-kadmind
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kadmind`
-case "$1" in
-    start)
-        stat_busy "Starting Kerberos Admin Daemon"
-        if [ -z "$PID" ]; then
-           /usr/sbin/kadmind
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon krb5-kadmind
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Kerberos Admin Daemon"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon krb5-kadmind
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/testing/krb5/krb5-kdc b/testing/krb5/krb5-kdc
deleted file mode 100644
index 05a03411e..000000000
--- a/testing/krb5/krb5-kdc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/krb5kdc`
-case "$1" in
-    start)
-        stat_busy "Starting Kerberos Authentication"
-        if [ -z "$PID" ]; then
-           /usr/sbin/krb5kdc
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon krb5-kdc
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Kerberos Authentication"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon krb5-kdc
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/testing/libcap-ng/PKGBUILD b/testing/libcap-ng/PKGBUILD
deleted file mode 100644
index 703b88617..000000000
--- a/testing/libcap-ng/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 138988 2011-09-28 19:32:09Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-
-pkgname=libcap-ng
-pkgver=0.6.6
-pkgrel=1
-pkgdesc="A library intended to make programming with POSIX capabilities much easier than the traditional libcap"
-arch=('i686' 'x86_64')
-url="http://people.redhat.com/sgrubb/libcap-ng/"
-license=('GPL2' 'LGPL2.1')
-depends=('glibc')
-options=('!libtool')
-source=(http://people.redhat.com/sgrubb/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('eb71f967cecb44b4342baac98ef8cb0f')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure --prefix=/usr --enable-static=no --with-python=no
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libchamplain/PKGBUILD b/testing/libchamplain/PKGBUILD
deleted file mode 100644
index b0e3a4da8..000000000
--- a/testing/libchamplain/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 138990 2011-09-28 19:32:11Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Michael Kanis <mkanis@gmx.de>
-
-pkgname=libchamplain
-pkgver=0.12.0
-pkgrel=1
-pkgdesc="Gtk3 widget for displaying rasterized maps"
-url="http://projects.gnome.org/libchamplain/"
-license=('LGPL')
-arch=('i686' 'x86_64')
-options=('!libtool')
-depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite3')
-makedepends=('gobject-introspection' 'gtk-doc' 'vala')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('c6d2b9dc3b8fd1715c95a11b428c9121828953fd02cf301a7eb577c9b5bdba85')
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    ./configure --prefix=/usr --disable-static --disable-debug \
-        --enable-vala
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install
-}
diff --git a/testing/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch b/testing/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch
deleted file mode 100644
index 5352688a2..000000000
--- a/testing/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 715c6ddf3de90936c9ba7a6bb6904b7072d3b241 Mon Sep 17 00:00:00 2001
-From: Ionut Biru <ibiru@archlinux.org>
-Date: Fri, 30 Sep 2011 10:57:14 +0000
-Subject: [PATCH] Avoid use of deprecated G_CONST_RETURN
-
-Signed-off-by: Ionut Biru <ibiru@archlinux.org>
----
- libepc/enums.c.in |    2 +-
- libepc/enums.h.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libepc/enums.c.in b/libepc/enums.c.in
-index 75f737c..bc81b84 100644
---- a/libepc/enums.c.in
-+++ b/libepc/enums.c.in
-@@ -65,7 +65,7 @@ G@Type@Class*
-  *
-  * Returns: The string representation of @value, or %NULL.
-  */
--G_CONST_RETURN gchar*
-+const gchar*
- @enum_name@_to_string (@EnumName@ value)
- {
-   const G@Type@Value *@type@_value = g_@type@_get_value (@enum_name@_get_class (), value);
-diff --git a/libepc/enums.h.in b/libepc/enums.h.in
-index fea8b07..48973e5 100644
---- a/libepc/enums.h.in
-+++ b/libepc/enums.h.in
-@@ -19,7 +19,7 @@ G_BEGIN_DECLS
- 
- GType                 @enum_name@_get_type  (void) G_GNUC_CONST;
- G@Type@Class*           @enum_name@_get_class (void) G_GNUC_CONST;
--G_CONST_RETURN gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE;
-+const gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE;
- /*** END value-header ***/
- 
- /*** BEGIN file-tail ***/
--- 
-1.7.6.4
-
diff --git a/testing/libepc/PKGBUILD b/testing/libepc/PKGBUILD
deleted file mode 100644
index 21b5e79d7..000000000
--- a/testing/libepc/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 139151 2011-09-30 11:14:26Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libepc
-pkgver=0.4.1
-pkgrel=1
-pkgdesc="Easy Publish and Consume Library"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://live.gnome.org/libepc"
-depends=('gtk3' 'avahi' 'libsoup')
-makedepends=('intltool' 'gtk-doc' 'gnome-common')
-options=('!libtool' '!makeflags')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.xz
-        0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch)
-sha256sums=('1377defd339122a5ef71509d3b761810c58f178985d655b74bc34760ef4ae49e'
-            'd2bcfd72abc4cd74975a70c667c38d88154117d1eef10a8e8b75bc07cb1dde06')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch"
-  gnome-autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-
diff --git a/testing/libgda/PKGBUILD b/testing/libgda/PKGBUILD
deleted file mode 100644
index 2f9311c28..000000000
--- a/testing/libgda/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 138992 2011-09-28 19:32:13Z ibiru $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=libgda
-pkgver=4.99.4
-pkgrel=1
-pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup'
-         'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring'
-         'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2'
-         'iso-codes' 'openssl' 'libgcrypt' 'libldap')
-makedepends=('intltool' 'gobject-introspection' 'java-environment' 'gtk-doc')
-options=('!libtool')
-url="http://www.gnome-db.org"
-install=libgda.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('efef38c0318d156ba3263416355847af961f561660793cb670633e056018beac')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i '1s/python$/&2/' libgda-report/RML/trml*/trml*.py
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --with-bdb=/usr --with-bdb-libdir-name=lib \
-      --disable-static --enable-json
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libgda/libgda.install b/testing/libgda/libgda.install
deleted file mode 100644
index c317fbaca..000000000
--- a/testing/libgda/libgda.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/libgdata/PKGBUILD b/testing/libgdata/PKGBUILD
deleted file mode 100644
index 75caeed20..000000000
--- a/testing/libgdata/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 138994 2011-09-28 19:32:14Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgdata
-pkgver=0.10.1
-pkgrel=1
-pkgdesc="GLib-based library for accessing online service APIs using the GData protocol"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup-gnome' 'liboauth')
-makedepends=('pkgconfig' 'intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d7f27b1019905792246336599cadc7470b362806ed5e2c038a9f7c0da257f6ef')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libgnome-keyring/PKGBUILD b/testing/libgnome-keyring/PKGBUILD
deleted file mode 100644
index 99852b639..000000000
--- a/testing/libgnome-keyring/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-#$Id: PKGBUILD 138998 2011-09-28 19:32:18Z ibiru $
-#Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=libgnome-keyring
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="GNOME keyring client library"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('dbus-core' 'libgcrypt' 'glib2')
-makedepends=('intltool' 'pkgconfig')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('0516403432b06ecc173c9f9dbe3eaa87b2c7a230806fcac4dfd73ad998e928f5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-keyring
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libgnomekbd/PKGBUILD b/testing/libgnomekbd/PKGBUILD
deleted file mode 100644
index f15236dd4..000000000
--- a/testing/libgnomekbd/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 138996 2011-09-28 19:32:16Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgnomekbd
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Gnome keyboard library"
-url="http://gswitchit.sourceforge.net"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libxklavier' 'gtk3' 'dconf')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-install=libgnomekbd.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('810ff305bbf076f6689911cf7b040d2113f501311a866abc37aa6bf5b28e1a2b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libgnomekbd/libgnomekbd.install b/testing/libgnomekbd/libgnomekbd.install
deleted file mode 100644
index 2ef26aaa9..000000000
--- a/testing/libgnomekbd/libgnomekbd.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/libgweather/PKGBUILD b/testing/libgweather/PKGBUILD
deleted file mode 100644
index 1f95013c5..000000000
--- a/testing/libgweather/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 139000 2011-09-28 19:32:20Z ibiru $
-# Maintainer: Jan de Groot  <jgc@archlinux.org>
-
-pkgname=libgweather
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Provides access to weather information from the net"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('gconf' 'libsoup-gnome' 'gnome-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org/"
-install=libgweather.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
-        gettext-not-xml.patch)
-sha256sums=('7fdae4aad787759ed0d0124d66991311a24c8c9a3c9a46c56f62e4cc4575aea9'
-            '5b6bf182294b8974a89492237d98b60678b83efcf31de8a0ca1bebd90f3356a3')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-
-    patch -Np1 -i "${srcdir}/gettext-not-xml.patch"
-    gtkdocize
-    autoreconf -fi
-
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --localstatedir=/var --disable-static \
-        --enable-locations-compression
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-    install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-    gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain libgweather ${pkgdir}/etc/gconf/schemas/*.schemas
-    rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/libgweather/gettext-not-xml.patch b/testing/libgweather/gettext-not-xml.patch
deleted file mode 100644
index db9c64148..000000000
--- a/testing/libgweather/gettext-not-xml.patch
+++ /dev/null
@@ -1,532 +0,0 @@
-diff -up libgweather-3.1.3/configure.ac.gettext libgweather-3.1.3/configure.ac
---- libgweather-3.1.3/configure.ac.gettext	2011-07-04 10:52:13.000000000 -0400
-+++ libgweather-3.1.3/configure.ac	2011-07-06 20:26:17.180168365 -0400
-@@ -43,19 +43,16 @@ GNOME_MAINTAINER_MODE_DEFINES
- LT_PREREQ([2.2.6])
- LT_INIT([dlopen win32-dll disable-static])
- 
-+dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations
-+AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile])
-+IT_PO_SUBDIR([po-locations])
-+
- IT_PROG_INTLTOOL([0.40.6])
- PKG_PROG_PKG_CONFIG([0.19])
- 
- AC_PROG_CC
- AC_PATH_PROG(GCONFTOOL, gconftool-2)
- 
--AC_ARG_ENABLE(all-translations-in-one-xml,
--        [AC_HELP_STRING([--enable-all-translations-in-one-xml],
--                        [Put all translations in a big Locations.xml file (slow to parse)])],
--        [enable_big_xml=yes],
--        [enable_big_xml=no])
--AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes")
--
- AC_ARG_ENABLE(locations-compression,
-         [AC_HELP_STRING([--enable-locations-compression],
-                         [Compress Locations.xml files])],
-@@ -191,7 +188,7 @@ AC_OUTPUT([
- Makefile
- doc/Makefile
- po/Makefile.in
--po-locations/Makefile
-+po-locations/Makefile.in
- libgweather/Makefile
- libgweather/gweather-3.0.pc
- libgweather/gweather-3.0-uninstalled.pc
-@@ -199,12 +196,6 @@ data/Makefile
- icons/Makefile
- ])
- 
--if test "x$enable_big_xml" = "xyes"; then
--	LOCATIONS_XML_TRANSLATIONS="one big file"
--else
--	LOCATIONS_XML_TRANSLATIONS="one file per translation"
--fi
--
- dnl ***************************************************************************
- dnl *** Display Summary                                                     ***
- dnl ***************************************************************************
-@@ -215,6 +206,4 @@ libgweather-$VERSION configure summary:
- 	Source code location:		${srcdir}
- 	Compiler:			${CC}
- 	Introspection support:          ${found_introspection}
--	Locations.xml translations:	${LOCATIONS_XML_TRANSLATIONS}
--	Locations.xml compression:	${enable_locations_compression}
- " >&2
-diff -up libgweather-3.1.3/data/Makefile.am.gettext libgweather-3.1.3/data/Makefile.am
---- libgweather-3.1.3/data/Makefile.am.gettext	2011-04-04 16:52:54.000000000 -0400
-+++ libgweather-3.1.3/data/Makefile.am	2011-07-06 20:18:42.244855841 -0400
-@@ -4,55 +4,23 @@ libgweatherdtd_DATA = locations.dtd
- libgweatherlocationsdir = $(pkgdatadir)
- libgweatherlocations_in_files = Locations.xml.in
- 
--if USE_ONE_BIG_XML
--
--LOCATIONS_STAMP = 
--
--libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT))
--
--%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
--	$(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
--	if test "x$(COMPRESS_EXT)" = "x.gz"; then				\
--		gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`;	\
--	fi
--
--else # USE_ONE_BIG_XML
--
- LOCATIONS_STAMP = stamp-Locations.xml
- 
--PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi)
--
- # Helper variable
--libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml)
--
--libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT)
-+libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml)
- 
- # We need this step so that we merge all the make Locations.xy.xml destinations
- # into one unique destination. This makes -j2 work. (Else, we end up with
- # multiple and conflicting calls to intltool-merge)
- $(libgweatherlocations_DATA): $(LOCATIONS_STAMP)
- 
--$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile
--	$(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \
--	for pofile in $(PO_LOCATIONS); do \
--		locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`;	\
--		xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \
--		rm -f $$locale/$(libgweatherlocations_data);		\
--		test -d $$locale && rmdir $$locale;			\
--		if test "x$(COMPRESS_EXT)" = "x.gz"; then		\
--			gzip --force Locations.$$locale.xml;		\
--		fi;							\
--	done &&								\
--	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \
--	rm -f C/$(libgweatherlocations_data) &&				\
--	test -d C && rmdir C &&						\
--	if test "x$(COMPRESS_EXT)" = "x.gz"; then			\
--		gzip --force Locations.xml;				\
--	fi &&								\
-+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile
-+	LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA)
-+	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA)
-+	rm -f C/$(libgweatherlocations_DATA)
-+	test -d C && rmdir C
- 	touch $@
- 
--endif # USE_ONE_BIG_XML
--
- ### Locations.xml.in rebuild
- rebuild-locations: locationdb.sqlite update-locations.py
- 	$(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new
-diff -up libgweather-3.1.3/libgweather/gweather-location.c.gettext libgweather-3.1.3/libgweather/gweather-location.c
---- libgweather-3.1.3/libgweather/gweather-location.c.gettext	2010-02-09 07:28:03.000000000 -0500
-+++ libgweather-3.1.3/libgweather/gweather-location.c	2011-07-06 20:18:42.251855754 -0400
-@@ -22,11 +22,14 @@
- #include <config.h>
- #endif
- 
-+#include "config.h"
-+
- #include <string.h>
- #include <math.h>
- #include <locale.h>
- #include <gtk/gtk.h>
- #include <libxml/xmlreader.h>
-+#include <libintl.h>
- 
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-location.h"
-@@ -184,10 +187,20 @@ location_new_from_xml (GWeatherParser *p
- 
- 	tagname = (const char *) xmlTextReaderConstName (parser->xml);
- 	if (!strcmp (tagname, "name") && !loc->name) {
--	    value = gweather_parser_get_localized_value (parser);
-+	    char *context = NULL;
-+	    context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
-+	   
-+	    value = gweather_parser_get_value (parser);
- 	    if (!value)
- 		goto error_out;
--	    loc->name = g_strdup (value);
-+
-+	    if (context != NULL) {
-+	    	loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value));
-+	    	xmlFree (context);
-+	    }
-+	    else
-+	    	loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value));
-+	    
- 	    xmlFree (value);
- 	    normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
- 	    loc->sort_name = g_utf8_casefold (normalized, -1);
-diff -up libgweather-3.1.3/libgweather/gweather-timezone.c.gettext libgweather-3.1.3/libgweather/gweather-timezone.c
---- libgweather-3.1.3/libgweather/gweather-timezone.c.gettext	2010-02-09 07:28:03.000000000 -0500
-+++ libgweather-3.1.3/libgweather/gweather-timezone.c	2011-07-06 20:18:42.252855742 -0400
-@@ -23,6 +23,7 @@
- #endif
- 
- #include <string.h>
-+#include <libintl.h>
- 
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-timezone.h"
-@@ -152,7 +153,7 @@ static GWeatherTimezone *
- parse_timezone (GWeatherParser *parser)
- {
-     GWeatherTimezone *zone = NULL;
--    char *id = NULL, *name = NULL;
-+    char *id = NULL, *name = NULL, *context = NULL;
-     int offset = 0, dst_offset = 0;
-     gboolean has_dst = FALSE;
- 
-@@ -175,27 +176,34 @@ parse_timezone (GWeatherParser *parser)
- 		continue;
- 	    }
- 
--	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name"))
--		name = gweather_parser_get_localized_value (parser);
-+	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) {
-+		context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
-+		name = gweather_parser_get_value (parser);
-+	    }
- 	    else {
- 		if (xmlTextReaderNext (parser->xml) != 1)
- 		    break;
- 	    }
- 	}
-     }
--
-+	    
-     if (parse_tzdata (id, parser->year_start, parser->year_end,
- 		      &offset, &has_dst, &dst_offset)) {
- 	zone = g_slice_new0 (GWeatherTimezone);
- 	zone->ref_count = 1;
- 	zone->id = g_strdup (id);
--	zone->name = g_strdup (name);
-+	if (context != NULL)
-+		zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name));
-+	else
-+		zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name));
- 	zone->offset = offset;
- 	zone->has_dst = has_dst;
- 	zone->dst_offset = dst_offset;
-     }
- 
-     xmlFree (id);
-+    if (context)
-+    	xmlFree (context);
-     if (name)
- 	xmlFree (name);
- 
-diff -up libgweather-3.1.3/po-locations/LINGUAS.gettext libgweather-3.1.3/po-locations/LINGUAS
---- libgweather-3.1.3/po-locations/LINGUAS.gettext	2011-07-06 20:18:42.253855730 -0400
-+++ libgweather-3.1.3/po-locations/LINGUAS	2011-07-06 20:18:42.253855730 -0400
-@@ -0,0 +1,78 @@
-+ang
-+ar
-+as
-+az
-+be
-+be@latin
-+bg
-+bn_IN
-+bn
-+bs
-+ca
-+cs
-+cy
-+da
-+de
-+dz
-+el
-+en_CA
-+en_GB
-+es
-+et
-+eu
-+fa
-+fi
-+fr
-+ga
-+gl
-+gu
-+he
-+hi
-+hr
-+hu
-+id
-+it
-+ja
-+ka
-+kn
-+ko
-+ku
-+ky
-+lt
-+lv
-+mai
-+mg
-+mk
-+ml
-+mn
-+mr
-+ms
-+nb
-+ne
-+nl
-+nn
-+oc
-+or
-+pa
-+pl
-+pt_BR
-+pt
-+ro
-+ru
-+rw
-+si
-+sk
-+sl
-+sq
-+sr@latin
-+sr
-+sv
-+ta
-+te
-+th
-+tr
-+uk
-+vi
-+zh_CN
-+zh_HK
-+zh_TW
-diff -up libgweather-3.1.3/po-locations/Makefile.in.in.gettext libgweather-3.1.3/po-locations/Makefile.in.in
---- libgweather-3.1.3/po-locations/Makefile.in.in.gettext	2011-07-06 20:18:42.254855718 -0400
-+++ libgweather-3.1.3/po-locations/Makefile.in.in	2011-07-06 20:18:42.254855718 -0400
-@@ -0,0 +1,217 @@
-+# Makefile for program source directory in GNU NLS utilities package.
-+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
-+#
-+# This file may be copied and used freely without restrictions.  It may
-+# be used in projects which are not available under a GNU Public License,
-+# but which still want to provide support for the GNU gettext functionality.
-+#
-+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-+#
-+# - Modified by jacob berkman <jacob@ximian.com> to install
-+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-+#
-+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
-+#
-+# We have the following line for use by intltoolize:
-+# INTLTOOL_MAKEFILE
-+
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations
-+PACKAGE = @PACKAGE@
-+VERSION = @VERSION@
-+
-+SHELL = /bin/sh
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = @top_builddir@
-+VPATH = @srcdir@
-+
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+libdir = @libdir@
-+DATADIRNAME = @DATADIRNAME@
-+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+subdir = po-locations
-+install_sh = @install_sh@
-+# Automake >= 1.8 provides @mkdir_p@.
-+# Until it can be supposed, use the safe fallback:
-+mkdir_p = $(install_sh) -d
-+
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+
-+GMSGFMT = @GMSGFMT@
-+MSGFMT = @MSGFMT@
-+XGETTEXT = @XGETTEXT@
-+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-+
-+ALL_LINGUAS = @ALL_LINGUAS@
-+
-+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-+
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-+
-+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-+
-+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-+
-+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
-+
-+POTFILES = \
-+# This comment gets stripped out
-+
-+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-+
-+.SUFFIXES:
-+.SUFFIXES: .po .pox .gmo .mo .msg .cat
-+
-+.po.pox:
-+	$(MAKE) $(GETTEXT_PACKAGE).pot
-+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-+
-+.po.mo:
-+	$(MSGFMT) -o $@ $<
-+
-+.po.gmo:
-+	file=`echo $* | sed 's,.*/,,'`.gmo \
-+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-+
-+.po.cat:
-+	sed -f ../intl/po2msg.sed < $< > $*.msg \
-+	  && rm -f $@ && gencat $@ $*.msg
-+
-+
-+all: all-@USE_NLS@
-+
-+all-yes: $(CATALOGS)
-+all-no:
-+
-+$(GETTEXT_PACKAGE).pot: $(POTFILES)
-+	$(GENPOT)
-+
-+install: install-data
-+install-data: install-data-@USE_NLS@
-+install-data-no: all
-+install-data-yes: all
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-+	  $(mkdir_p) $$dir; \
-+	  if test -r $$lang.gmo; then \
-+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-+	  else \
-+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+	    echo "installing $(srcdir)/$$lang.gmo as" \
-+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
-+	  fi; \
-+	  if test -r $$lang.gmo.m; then \
-+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+	  else \
-+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+	    else \
-+	      true; \
-+	    fi; \
-+	  fi; \
-+	done
-+
-+# Empty stubs to satisfy archaic automake needs
-+dvi info tags TAGS ID:
-+
-+# Define this as empty until I found a useful application.
-+install-exec installcheck:
-+
-+uninstall:
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-+	done
-+
-+check: all $(GETTEXT_PACKAGE).pot
-+	rm -f missing notexist
-+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-+	if [ -r missing -o -r notexist ]; then \
-+	  exit 1; \
-+	fi
-+
-+mostlyclean:
-+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-+	rm -f .intltool-merge-cache
-+
-+clean: mostlyclean
-+
-+distclean: clean
-+	rm -f Makefile Makefile.in POTFILES stamp-it
-+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
-+
-+maintainer-clean: distclean
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+	rm -f Makefile.in.in
-+
-+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-+dist distdir: $(DISTFILES)
-+	dists="$(DISTFILES)"; \
-+	extra_dists="$(EXTRA_DISTFILES)"; \
-+	for file in $$extra_dists; do \
-+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-+	done; \
-+	for file in $$dists; do \
-+	  test -f $$file || file="$(srcdir)/$$file"; \
-+	  ln $$file $(distdir) 2> /dev/null \
-+	    || cp -p $$file $(distdir); \
-+	done
-+
-+update-po: Makefile
-+	$(MAKE) $(GETTEXT_PACKAGE).pot
-+	tmpdir=`pwd`; \
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  echo "$$lang:"; \
-+	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-+	  if $$result; then \
-+	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-+	      rm -f $$tmpdir/$$lang.new.po; \
-+            else \
-+	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-+	        :; \
-+	      else \
-+	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-+	        rm -f $$tmpdir/$$lang.new.po; \
-+	        exit 1; \
-+	      fi; \
-+	    fi; \
-+	  else \
-+	    echo "msgmerge for $$lang.gmo failed!"; \
-+	    rm -f $$tmpdir/$$lang.new.po; \
-+	  fi; \
-+	done
-+
-+Makefile POTFILES: stamp-it
-+	@if test ! -f $@; then \
-+	  rm -f stamp-it; \
-+	  $(MAKE) stamp-it; \
-+	fi
-+
-+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-+	       $(SHELL) ./config.status
-+
-+# Tell versions [3.59,3.63) of GNU make not to export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -up libgweather-3.1.3/po-locations/POTFILES.in.gettext libgweather-3.1.3/po-locations/POTFILES.in
---- libgweather-3.1.3/po-locations/POTFILES.in.gettext	2011-07-06 20:18:42.254855718 -0400
-+++ libgweather-3.1.3/po-locations/POTFILES.in	2011-07-06 20:18:42.254855718 -0400
-@@ -0,0 +1,4 @@
-+# This list should contain *only* data/Locations.xml.in.
-+# Everything else should be in POTFILES.skip.
-+[encoding:UTF-8]
-+data/Locations.xml.in
diff --git a/testing/libgweather/libgweather.install b/testing/libgweather/libgweather.install
deleted file mode 100644
index 7062d4167..000000000
--- a/testing/libgweather/libgweather.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=libgweather
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-}
diff --git a/testing/liblouis/PKGBUILD b/testing/liblouis/PKGBUILD
deleted file mode 100644
index e2e2e794a..000000000
--- a/testing/liblouis/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 139002 2011-09-28 19:32:22Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=liblouis
-pkgver=2.3.0
-pkgrel=1
-pkgdesc="Open-source braille translator and back-translator"
-arch=(i686 x86_64)
-url="http://code.google.com/p/liblouis/"
-license=('GPL3')
-depends=(glibc)
-makedepends=(help2man python2)
-optdepends=('python2: for python bindings')
-options=(!libtool)
-install=liblouis.install
-source=(http://liblouis.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('f670c4fd845b3310ec02140fb26d912bdb1df356')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  cd python
-  LD_PRELOAD+=":$srcdir/$pkgname-$pkgver/liblouis/.libs/liblouis.so"
-  python2 setup.py install --root="$pkgdir" --prefix="/usr" --optimize=1
-}
-# vim:set ts=2 sw=2 et:
diff --git a/testing/liblouis/liblouis.install b/testing/liblouis/liblouis.install
deleted file mode 100644
index 2a05ba27a..000000000
--- a/testing/liblouis/liblouis.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(liblouis.info)
-
-post_install() {
-    [ -x usr/bin/install-info ] || return 0
-    for file in ${filelist[@]}; do
-        install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-    done
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    [ -x usr/bin/install-info ] || return 0
-    for file in ${filelist[@]}; do
-        install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-    done
-}
diff --git a/testing/libpeas/PKGBUILD b/testing/libpeas/PKGBUILD
deleted file mode 100644
index 41a36fb4f..000000000
--- a/testing/libpeas/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 139004 2011-09-28 19:32:24Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=libpeas
-pkgver=1.2.0
-pkgrel=1
-pkgdesc="A GObject-based plugins engine"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection')
-makedepends=('gtk-doc' 'intltool' 'vala' 'python2-gobject' 'gjs' 'seed')
-optdepends=('gjs: gobject-based plugin engine - gjs runtime loader'
-            'seed: gbject-based plugin engine - seed runtime loader')
-options=('!libtool')
-install=libpeas.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('871868ff44352367a4b4602352f60fd20eb99794ade454f3b120d87c1560f31c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libpeas/libpeas.install b/testing/libpeas/libpeas.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/testing/libpeas/libpeas.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/libsasl/0003_saslauthd_mdoc.patch b/testing/libsasl/0003_saslauthd_mdoc.patch
deleted file mode 100644
index 694f4bb67..000000000
--- a/testing/libsasl/0003_saslauthd_mdoc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-0003_saslauthd_mdoc.dpatch by  <fabbe@debian.org>
-
-Use the correct path for the saslauthd.conf file, and use another
-date format (cosmetic).
-
-diff -urNad trunk~/saslauthd/saslauthd.mdoc trunk/saslauthd/saslauthd.mdoc
---- trunk~/saslauthd/saslauthd.mdoc	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/saslauthd.mdoc	2006-07-12 15:05:25.000000000 +0300
-@@ -10,7 +10,7 @@
- .\" manpage in saslauthd.8 whenever you change this source
- .\" version. Only the pre-formatted manpage is installed.
- .\"
--.Dd 10 24 2002
-+.Dd October 24 2002
- .Dt SASLAUTHD 8
- .Os "CMU-SASL"
- .Sh NAME
-@@ -216,7 +216,7 @@
- .Em (All platforms that support OpenLDAP 2.0 or higher)
- .Pp
- Authenticate against an ldap server.  The ldap configuration parameters are
--read from /usr/local/etc/saslauthd.conf.  The location of this file can be
-+read from /etc/saslauthd.conf.  The location of this file can be
- changed with the -O parameter. See the LDAP_SASLAUTHD file included with the
- distribution for the list of available parameters.
- .It Li sia
-@@ -249,7 +249,7 @@
- .Bl -tag -width "/var/run/saslauthd/mux"
- .It Pa /var/run/saslauthd/mux
- The default communications socket.
--.It Pa /usr/local/etc/saslauthd.conf
-+.It Pa /etc/saslauthd.conf
- The default configuration file for ldap support.
- .El
- .Sh SEE ALSO
diff --git a/testing/libsasl/0010_maintainer_mode.patch b/testing/libsasl/0010_maintainer_mode.patch
deleted file mode 100644
index cf3d02a08..000000000
--- a/testing/libsasl/0010_maintainer_mode.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 0010_maintainer_mode.dpatch by  <fabbe@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Enable maintainer mode to avoid auto* problems.
-
-@DPATCH@
-diff -urNad trunk~/configure.in trunk/configure.in
---- trunk~/configure.in	2006-05-29 22:52:46.000000000 +0300
-+++ trunk/configure.in	2006-11-01 23:24:55.000000000 +0200
-@@ -62,6 +62,8 @@
- AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.22)
- CMU_INIT_AUTOMAKE
- 
-+AM_MAINTAINER_MODE
-+
- # and include our config dir scripts
- ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config"
- 
diff --git a/testing/libsasl/0011_saslauthd_ac_prog_libtool.patch b/testing/libsasl/0011_saslauthd_ac_prog_libtool.patch
deleted file mode 100644
index 3805b4857..000000000
--- a/testing/libsasl/0011_saslauthd_ac_prog_libtool.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-0011_saslauthd_ac_prog_libtool.dpatch by  <fabbe@debian.org>
-
-Enable libtool use.
-
-diff -urNad trunk~/saslauthd/configure.in trunk/saslauthd/configure.in
---- trunk~/saslauthd/configure.in	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/configure.in	2006-11-01 23:41:51.000000000 +0200
-@@ -25,6 +25,7 @@
- AC_PROG_MAKE_SET
- AC_PROG_LN_S
- AC_PROG_INSTALL
-+AC_PROG_LIBTOOL
- 
- dnl Checks for build foo
- CMU_C___ATTRIBUTE__
diff --git a/testing/libsasl/0012_xopen_crypt_prototype.patch b/testing/libsasl/0012_xopen_crypt_prototype.patch
deleted file mode 100644
index d50ec8343..000000000
--- a/testing/libsasl/0012_xopen_crypt_prototype.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-0012_xopen_crypt_prototype.dpatch by  <dannf@debian.org>
-
-When _XOPEN_SOURCE is defined, the subsequent #include <unistd.h>
-will define a correct function prototype for the crypt function.
-This avoids segfaults on architectures where the size of a pointer
-is greater than the size of an integer (ia64 and amd64 are examples).
-This may be detected by looking for build log lines such as the
-following:
-auth_shadow.c:183: warning: implicit declaration of function ‘crypt’
-auth_shadow.c:183: warning: cast to pointer from integer of different
-size
-
-diff -urNad trunk~/saslauthd/auth_shadow.c trunk/saslauthd/auth_shadow.c
---- trunk~/saslauthd/auth_shadow.c	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/auth_shadow.c	2006-11-08 13:44:23.000000000 +0200
-@@ -1,3 +1,4 @@
-+#define _XOPEN_SOURCE
- #define PWBUFSZ 256 /***SWB***/
- 
- /* MODULE: auth_shadow */
diff --git a/testing/libsasl/0016_pid_file_lock_creation_mask.patch b/testing/libsasl/0016_pid_file_lock_creation_mask.patch
deleted file mode 100644
index e9170cef3..000000000
--- a/testing/libsasl/0016_pid_file_lock_creation_mask.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar <sam@zoy.org>
-
-pid_file_lock is created with a mask of 644 instead of 0644.
-This patch fixes this octal/decimal confusion as well as the
-(harmless) one in the previous umask() call.
-
-diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c
---- trunk~/saslauthd/saslauthd-main.c	2006-05-29 22:52:42.000000000 +0300
-+++ trunk/saslauthd/saslauthd-main.c	2007-06-26 12:07:10.000000000 +0300
-@@ -276,7 +276,7 @@
- 		exit(1);
- 	}
- 
--	umask(077);
-+	umask(0077);
- 
- 	pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1;
- 	if ((pid_file_lock = malloc(pid_file_size)) == NULL) {
-@@ -287,7 +287,7 @@
- 	strlcpy(pid_file_lock, run_path, pid_file_size);
- 	strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size);
- 
--	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) {
-+	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) {
- 		rc = errno;
- 		logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock);
- 		logger(L_ERR, L_FUNC, "open: %s", strerror(rc));
diff --git a/testing/libsasl/0018_auth_rimap_quotes.patch b/testing/libsasl/0018_auth_rimap_quotes.patch
deleted file mode 100644
index 13fa999f0..000000000
--- a/testing/libsasl/0018_auth_rimap_quotes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-0016_auth_rimap_quotes.dpatch by  <fabbe@debian.org>
-
-All lines beginning with `## DP:' are a description of the patch.
-Avoid infinite loop when username/password has a double quote character.
-Upstream change: https://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/sasl/saslauthd/auth_rimap.c.diff?r1=1.12;r2=1.13
-
-diff -urNad etch~/saslauthd/auth_rimap.c etch/saslauthd/auth_rimap.c
---- etch~/saslauthd/auth_rimap.c	2007-03-29 15:16:20.000000000 +0300
-+++ etch/saslauthd/auth_rimap.c	2008-02-13 13:42:53.000000000 +0200
-@@ -162,6 +162,7 @@
-     num_quotes = 0;
-     p1 = s;
-     while ((p1 = strchr(p1, '"')) != NULL) {
-+	p1++;
- 	num_quotes++;
-     }
-     
-@@ -438,7 +439,7 @@
- 	syslog(LOG_WARNING, "auth_rimap: writev: %m");
- 	memset(qlogin, 0, strlen(qlogin));
- 	free(qlogin);
--	memset(qpass, 0, strlen(qlogin));
-+	memset(qpass, 0, strlen(qpass));
- 	free(qpass);
- 	(void)close(s);
- 	return strdup(RESP_IERROR);
-@@ -447,7 +448,7 @@
-     /* don't need these any longer */
-     memset(qlogin, 0, strlen(qlogin));
-     free(qlogin);
--    memset(qpass, 0, strlen(qlogin));
-+    memset(qpass, 0, strlen(qpass));
-     free(qpass);
- 
-     /* read and parse the LOGIN response */
diff --git a/testing/libsasl/0019_ldap_deprecated.patch b/testing/libsasl/0019_ldap_deprecated.patch
deleted file mode 100644
index 8825256cb..000000000
--- a/testing/libsasl/0019_ldap_deprecated.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-0019_ldap_deprecated.dpatch by  dann frazier <dannf@debian.org>
-
-The function ldap_get_values, used in saslauthd/lak.c, is deprecated.
-Therefore, its prototype is not included by default when compiling
-against the ldap.h headers. As a result, the compiler cannot know the
-return type of the function at compile time, and will implicitly
-convert to a pointer. This has implications on 64-bit systems.
-This patch sets the deprecation mode on, so that the function prototype
-gets included when compiling.
-(Description by Fabian Fagerholm <fabbe@debian.org>)
-
-diff -urNad trunk~/saslauthd/lak.c trunk/saslauthd/lak.c
---- trunk~/saslauthd/lak.c	2006-06-04 12:26:20.000000000 +0300
-+++ trunk/saslauthd/lak.c	2008-02-15 14:32:11.000000000 +0200
-@@ -55,6 +55,7 @@
- #include <openssl/des.h>
- #endif
- 
-+#define LDAP_DEPRECATED 1
- #include <ldap.h>
- #include <lber.h>
- #include <sasl.h>
diff --git a/testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch b/testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch
deleted file mode 100644
index a49b553f0..000000000
--- a/testing/libsasl/0022_gcc4.4_preprocessor_syntax.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-0022_gcc4.4_preprocessor_syntax.dpatch by  <fabbe@paniq.net>
-
-The #elif preprocessor directive requires a test condition.
-GCC 4.4 enforces this rule.
-
-diff -urNad trunk~/plugins/digestmd5.c trunk/plugins/digestmd5.c
---- trunk~/plugins/digestmd5.c	2006-06-04 12:26:19.000000000 +0300
-+++ trunk/plugins/digestmd5.c	2009-01-26 13:29:40.000000000 +0200
-@@ -2715,7 +2715,7 @@
- 	"DIGEST-MD5",			/* mech_name */
- #ifdef WITH_RC4
- 	128,				/* max_ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 	112,
- #else 
- 	1,
-@@ -4034,7 +4034,7 @@
- 	"DIGEST-MD5",
- #ifdef WITH_RC4				/* mech_name */
- 	128,				/* max ssf */
--#elif WITH_DES
-+#elif defined(WITH_DES)
- 	112,
- #else
- 	1,
diff --git a/testing/libsasl/0025_ld_as_needed.patch b/testing/libsasl/0025_ld_as_needed.patch
deleted file mode 100644
index 67b48b4a4..000000000
--- a/testing/libsasl/0025_ld_as_needed.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Matthias Klose <doko@ubuntu.com>
-Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
-it.
---- a/saslauthd/Makefile.am
-+++ b/saslauthd/Makefile.am
-@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c
- saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
- saslauthd_LDADD	= @SASL_KRB_LIB@ \
- 		  @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
--		  @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
-+		  @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
- 
- testsaslauthd_SOURCES = testsaslauthd.c utils.c
- testsaslauthd_LDADD = @LIB_SOCKET@
---- a/sasldb/Makefile.am
-+++ b/sasldb/Makefile.am
-@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a
- 
- libsasldb_la_SOURCES = allockey.c sasldb.h
- EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
--libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
--libsasldb_la_LIBADD = $(SASL_DB_BACKEND) 
-+libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
-+libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
- 
- # Prevent make dist stupidity
- libsasldb_a_SOURCES =
diff --git a/testing/libsasl/0026_drop_krb5support_dependency.patch b/testing/libsasl/0026_drop_krb5support_dependency.patch
deleted file mode 100644
index cc00867ef..000000000
--- a/testing/libsasl/0026_drop_krb5support_dependency.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Roberto C. Sanchez <roberto@connexer.com>
-Description: Drop gratuitous dependency on krb5support
---- a/cmulocal/sasl2.m4
-+++ b/cmulocal/sasl2.m4
-@@ -112,9 +112,6 @@ if test "$gssapi" != no; then
-   fi
- 
-   if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
--    # check for libkrb5support first
--    AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
--
-     gss_failed=0
-     AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
-                  ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
diff --git a/testing/libsasl/0027_db5_support.patch b/testing/libsasl/0027_db5_support.patch
deleted file mode 100644
index 522824074..000000000
--- a/testing/libsasl/0027_db5_support.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Ondřej Surý <ondrej@debian.org>
-Description: Support newer Berkeley DB versions
---- a/sasldb/db_berkeley.c
-+++ b/sasldb/db_berkeley.c
-@@ -101,7 +101,7 @@ static int berkeleydb_open(const sasl_ut
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, flags, 0660);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, flags, 0660);
---- a/utils/dbconverter-2.c
-+++ b/utils/dbconverter-2.c
-@@ -214,7 +214,7 @@ static int berkeleydb_open(const char *p
-     ret = db_create(mbdb, NULL, 0);
-     if (ret == 0 && *mbdb != NULL)
-     {
--#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
- 	ret = (*mbdb)->open(*mbdb, NULL, path, NULL, DB_HASH, DB_CREATE, 0664);
- #else
- 	ret = (*mbdb)->open(*mbdb, path, NULL, DB_HASH, DB_CREATE, 0664);
diff --git a/testing/libsasl/0030-dont_use_la_files_for_opening_plugins.patch b/testing/libsasl/0030-dont_use_la_files_for_opening_plugins.patch
deleted file mode 100644
index 14a322496..000000000
--- a/testing/libsasl/0030-dont_use_la_files_for_opening_plugins.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- a/lib/dlopen.c
-+++ b/lib/dlopen.c
-@@ -247,105 +247,6 @@ static int _sasl_plugin_load(char *plugi
-     return result;
- }
- 
--/* this returns the file to actually open.
-- *  out should be a buffer of size PATH_MAX
-- *  and may be the same as in. */
--
--/* We'll use a static buffer for speed unless someone complains */
--#define MAX_LINE 2048
--
--static int _parse_la(const char *prefix, const char *in, char *out) 
--{
--    FILE *file;
--    size_t length;
--    char line[MAX_LINE];
--    char *ntmp = NULL;
--
--    if(!in || !out || !prefix || out == in) return SASL_BADPARAM;
--
--    /* Set this so we can detect failure */
--    *out = '\0';
--
--    length = strlen(in);
--
--    if (strcmp(in + (length - strlen(LA_SUFFIX)), LA_SUFFIX)) {
--	if(!strcmp(in + (length - strlen(SO_SUFFIX)),SO_SUFFIX)) {
--	    /* check for a .la file */
--	    strcpy(line, prefix);
--	    strcat(line, in);
--	    length = strlen(line);
--	    *(line + (length - strlen(SO_SUFFIX))) = '\0';
--	    strcat(line, LA_SUFFIX);
--	    file = fopen(line, "r");
--	    if(file) {
--		/* We'll get it on the .la open */
--		fclose(file);
--		return SASL_FAIL;
--	    }
--	}
--	strcpy(out, prefix);
--	strcat(out, in);
--	return SASL_OK;
--    }
--
--    strcpy(line, prefix);
--    strcat(line, in);
--
--    file = fopen(line, "r");
--    if(!file) {
--	_sasl_log(NULL, SASL_LOG_WARN,
--		  "unable to open LA file: %s", line);
--	return SASL_FAIL;
--    }
--    
--    while(!feof(file)) {
--	if(!fgets(line, MAX_LINE, file)) break;
--	if(line[strlen(line) - 1] != '\n') {
--	    _sasl_log(NULL, SASL_LOG_WARN,
--		      "LA file has too long of a line: %s", in);
--	    return SASL_BUFOVER;
--	}
--	if(line[0] == '\n' || line[0] == '#') continue;
--	if(!strncmp(line, "dlname=", sizeof("dlname=") - 1)) {
--	    /* We found the line with the name in it */
--	    char *end;
--	    char *start;
--	    size_t len;
--	    end = strrchr(line, '\'');
--	    if(!end) continue;
--	    start = &line[sizeof("dlname=")-1];
--	    len = strlen(start);
--	    if(len > 3 && start[0] == '\'') {
--		ntmp=&start[1];
--		*end='\0';
--		/* Do we have dlname="" ? */
--		if(ntmp == end) {
--		    _sasl_log(NULL, SASL_LOG_DEBUG,
--			      "dlname is empty in .la file: %s", in);
--		    return SASL_FAIL;
--		}
--		strcpy(out, prefix);
--		strcat(out, ntmp);
--	    }
--	    break;
--	}
--    }
--    if(ferror(file) || feof(file)) {
--	_sasl_log(NULL, SASL_LOG_WARN,
--		  "Error reading .la: %s\n", in);
--	fclose(file);
--	return SASL_FAIL;
--    }
--    fclose(file);
--
--    if(!(*out)) {
--	_sasl_log(NULL, SASL_LOG_WARN,
--		  "Could not find a dlname line in .la file: %s", in);
--	return SASL_FAIL;
--    }
--
--    return SASL_OK;
--}
- #endif /* DO_DLOPEN */
- 
- /* loads a plugin library */
-@@ -499,18 +400,18 @@ int _sasl_load_plugins(const add_plugin_
- 		if (length + pos>=PATH_MAX) continue; /* too big */
- 
- 		if (strcmp(dir->d_name + (length - strlen(SO_SUFFIX)),
--			   SO_SUFFIX)
--		    && strcmp(dir->d_name + (length - strlen(LA_SUFFIX)),
--			   LA_SUFFIX))
-+			   SO_SUFFIX))
- 		    continue;
- 
-+		/* We only use .so files for loading plugins */
-+
- 		memcpy(name,dir->d_name,length);
- 		name[length]='\0';
- 
--		result = _parse_la(prefix, name, tmp);
--		if(result != SASL_OK)
--		    continue;
--		
-+		/* Create full name with path */
-+		strncpy(tmp, prefix, PATH_MAX);
-+		strncat(tmp, name, PATH_MAX);
-+
- 		/* skip "lib" and cut off suffix --
- 		   this only need be approximate */
- 		strcpy(plugname, name + 3);
diff --git a/testing/libsasl/PKGBUILD b/testing/libsasl/PKGBUILD
deleted file mode 100644
index 4d207429d..000000000
--- a/testing/libsasl/PKGBUILD
+++ /dev/null
@@ -1,202 +0,0 @@
-# $Id: PKGBUILD 139568 2011-10-03 13:37:30Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-# This package spans multiple repositories. 
-# Always build from cyrus-sasl/trunk and merge changes to libsasl/trunk.
-
-#pkgbase=('cyrus-sasl')
-#pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
-pkgname=libsasl
-pkgver=2.1.23
-pkgrel=8
-pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
-arch=('i686' 'x86_64')
-url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
-license=('custom')
-options=('!makeflags' '!libtool')
-makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
-source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
-        cyrus-sasl-2.1.19-checkpw.c.patch
-        cyrus-sasl-2.1.22-crypt.patch
-        cyrus-sasl-2.1.22-qa.patch
-        cyrus-sasl-2.1.22-automake-1.10.patch
-        cyrus-sasl-2.1.23-authd-fix.patch
-        0003_saslauthd_mdoc.patch
-        0010_maintainer_mode.patch
-        0011_saslauthd_ac_prog_libtool.patch
-        0012_xopen_crypt_prototype.patch
-        0016_pid_file_lock_creation_mask.patch
-        0018_auth_rimap_quotes.patch
-        0019_ldap_deprecated.patch
-        0022_gcc4.4_preprocessor_syntax.patch
-        0025_ld_as_needed.patch
-        0026_drop_krb5support_dependency.patch
-        0027_db5_support.patch
-        0030-dont_use_la_files_for_opening_plugins.patch
-        saslauthd.conf.d
-        saslauthd)
-md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
-         'e27ddff076342e7a3041c4759817d04b'
-         'd7e6886e88af04d05f3dec7f0a59ccf7'
-         '79b8a5e8689989e2afd4b7bda595a7b1'
-         'f4131b077ddb5240b375d749162f1b7a'
-         'c7ad2c70c1ef814eb4b119f316c064f2'
-         'caeeac3feba19cbbd36e7345cc805600'
-         'f45d8b60e8f74dd7f7c2ec1665fa602a'
-         '9d93880514cb5ff5da969f1ceb64a661'
-         'dfdc052a7e678db9f687482c5d52f34e'
-         '4a09f6b24b91f8450892a78e378860da'
-         '213abe7c5dfe0d7f446992787da1e780'
-         '5a0321177ad30cb5518c8b6812e3961a'
-         '0c965748970eea29fa295524821d43f0'
-         '62bf892fe4d1df41ff748e91a1afaf67'
-         'b7848957357e7c02d6490102be496bf9'
-         'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
-         '8e7106f32e495e9ade69014fd1b3352a'
-         '49219af5641150edec288a3fdb65e7c1'
-         '75542f613185d5a90520ad0d7d926a20')
-
-build() {
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.19-checkpw.c.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-crypt.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-qa.patch"
-  patch -Np1 -i "${srcdir}/cyrus-sasl-2.1.22-automake-1.10.patch"
-  patch -Np0 -i "${srcdir}/cyrus-sasl-2.1.23-authd-fix.patch"
-  patch -Np1 -i "${srcdir}/0003_saslauthd_mdoc.patch"
-  patch -Np1 -i "${srcdir}/0010_maintainer_mode.patch"
-  patch -Np1 -i "${srcdir}/0011_saslauthd_ac_prog_libtool.patch"
-  patch -Np1 -i "${srcdir}/0012_xopen_crypt_prototype.patch"
-  patch -Np1 -i "${srcdir}/0016_pid_file_lock_creation_mask.patch"
-  patch -Np1 -i "${srcdir}/0018_auth_rimap_quotes.patch"
-  patch -Np1 -i "${srcdir}/0019_ldap_deprecated.patch"
-  patch -Np1 -i "${srcdir}/0022_gcc4.4_preprocessor_syntax.patch"
-  patch -Np1 -i "${srcdir}/0025_ld_as_needed.patch"
-  patch -Np1 -i "${srcdir}/0026_drop_krb5support_dependency.patch"
-  patch -Np1 -i "${srcdir}/0027_db5_support.patch"
-  patch -Np1 -i "${srcdir}/0030-dont_use_la_files_for_opening_plugins.patch"
-
-  rm -f config/config.guess config/config.sub 
-  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
-  rm -fr autom4te.cache
-  libtoolize -c
-  aclocal -I config -I cmulocal
-  automake -a -c
-  autoheader
-  autoconf
-
-  pushd saslauthd
-  rm -f config/config.guess config/config.sub 
-  rm -f config/ltconfig config/ltmain.sh config/libtool.m4
-  rm -fr autom4te.cache
-  libtoolize -c
-  aclocal -I config -I ../cmulocal -I ../config
-  automake -a -c
-  autoheader
-  autoconf
-  popd
-
-  ./configure --prefix=/usr \
-      --mandir=/usr/share/man \
-      --infodir=/usr/share/info \
-      --disable-static \
-      --enable-shared \
-      --enable-alwaystrue \
-      --enable-checkapop \
-      --enable-cram \
-      --enable-digest \
-      --disable-otp \
-      --disable-srp \
-      --disable-srp-setpass \
-      --disable-krb4 \
-      --enable-gssapi \
-      --enable-auth-sasldb \
-      --enable-plain \
-      --enable-anon \
-      --enable-login \
-      --enable-ntlm \
-      --disable-passdss \
-      --enable-sql \
-      --enable-ldapdb \
-      --disable-macos-framework \
-      --with-pam \
-      --with-saslauthd=/var/run/saslauthd \
-      --with-ldap \
-      --with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
-      --sysconfdir=/etc \
-      --with-devrandom=/dev/urandom
-  make
-}
-
-package_libsasl() {
-  pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library"
-  depends=('openssl')
-  conflicts=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}"
-  for dir in include lib sasldb plugins utils; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-  rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so*
-  rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so*
-  rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so*
-  install -m755 -d "${pkgdir}/usr/share/licenses/libsasl"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/"
-}
-
-package_cyrus-sasl() {
-  depends=("libsasl=${pkgver}-${pkgrel}")
-  pkgdesc="Cyrus saslauthd SASL authentication daemon"
-  backup=('etc/conf.d/saslauthd')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/rc.d"
-  install -m755 -d "${pkgdir}/etc/conf.d"
-  install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/"
-  install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/"
-}
-
-package_cyrus-sasl-gssapi() {
-  pkgdesc="GSSAPI authentication mechanism for Cyrus SASL"
-  depends=("libsasl=${pkgver}-${pkgrel}" 'krb5')
-  replaces=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
-  install -m755 -d "${pkgdir}/usr/lib/sasl2"
-  cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/"
-}
-
-package_cyrus-sasl-ldap() {
-  pkgdesc="ldapdb auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}-${pkgrel}" 'libldap')
-  replaces=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
-  install -m755 -d "${pkgdir}/usr/lib/sasl2"
-  cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/"
-}
-
-package_cyrus-sasl-sql() {
-  pkgdesc="SQL auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}-${pkgrel}" 'postgresql-libs' 'libmysqlclient')
-  replaces=('cyrus-sasl-plugins')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
-  install -m755 -d "${pkgdir}/usr/lib/sasl2"
-  cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql"
-  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/"
-}
diff --git a/testing/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch b/testing/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch
deleted file mode 100644
index f7bf44b79..000000000
--- a/testing/libsasl/cyrus-sasl-2.1.19-checkpw.c.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -ur ../cyrus-sasl-2.1.19.orig/lib/Makefile.in ./lib/Makefile.in
---- ../cyrus-sasl-2.1.19.orig/lib/Makefile.in	2004-07-02 21:40:15.000000000 +0200
-+++ ./lib/Makefile.in	2004-09-07 13:21:22.746680576 +0200
-@@ -120,7 +120,7 @@
- JAVA_TRUE = @JAVA_TRUE@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = -lcrypt @LIBS@
- LIBTOOL = @LIBTOOL@
- LIB_CRYPT = @LIB_CRYPT@
- LIB_DES = @LIB_DES@
-diff -ur ../cyrus-sasl-2.1.19.orig/lib/checkpw.c ./lib/checkpw.c
---- ../cyrus-sasl-2.1.19.orig/lib/checkpw.c	2004-03-17 14:58:13.000000000 +0100
-+++ ./lib/checkpw.c	2004-09-07 13:21:12.645916147 +0200
-@@ -94,6 +94,23 @@
- # endif
- #endif
- 
-+/******************************
-+ * crypt(3) patch start       *
-+ ******************************/
-+char *crypt(const char *key, const char *salt);
-+
-+/* cleartext password formats */
-+#define PASSWORD_FORMAT_CLEARTEXT 1
-+#define PASSWORD_FORMAT_CRYPT 2
-+#define PASSWORD_FORMAT_CRYPTTRAD 3
-+#define PASSWORD_SALT_BUF_LEN 22
-+
-+/* weeds out crypt(3) password's salt */
-+int _sasl_get_salt (char *dest, char *src, int format);
-+
-+/******************************
-+ * crypt(3) patch stop        *
-+ ******************************/
- 
- /* we store the following secret to check plaintext passwords:
-  *
-@@ -143,7 +160,51 @@
- 				       "*cmusaslsecretPLAIN",
- 				       NULL };
-     struct propval auxprop_values[3];
--    
-+
-+	/******************************
-+	 * crypt(3) patch start       *
-+	 * for password format check  *
-+	 ******************************/
-+    sasl_getopt_t *getopt;
-+    void *context;
-+    const char *p = NULL;
-+	/**
-+	 * MD5: 12 char salt
-+	 * BLOWFISH: 16 char salt
-+	 */
-+	char salt[PASSWORD_SALT_BUF_LEN];
-+	int password_format;
-+
-+	/* get password format from auxprop configuration */
-+	if (_sasl_getcallback(conn, SASL_CB_GETOPT, &getopt, &context) == SASL_OK) {
-+		getopt(context, NULL, "password_format", &p, NULL);
-+	}
-+
-+	/* set password format */
-+	if (p) {
-+		/*
-+		memset(pass_format_str, '\0', PASSWORD_FORMAT_STR_LEN);
-+		strncpy(pass_format_str, p, (PASSWORD_FORMAT_STR_LEN - 1));
-+		*/
-+		/* modern, modular crypt(3) */
-+		if (strncmp(p, "crypt", 11) == 0)
-+			password_format = PASSWORD_FORMAT_CRYPT;
-+		/* traditional crypt(3) */
-+		else if (strncmp(p, "crypt_trad", 11) == 0)
-+			password_format = PASSWORD_FORMAT_CRYPTTRAD;
-+		/* cleartext password */
-+		else
-+			password_format = PASSWORD_FORMAT_CLEARTEXT;
-+	} else {
-+		/* cleartext password */
-+		password_format = PASSWORD_FORMAT_CLEARTEXT;
-+	}
-+
-+	/******************************
-+	 * crypt(3) patch stop        *
-+	 * for password format check  *
-+	 ******************************/
-+
-     if (!conn || !userstr)
- 	return SASL_BADPARAM;
- 
-@@ -180,14 +241,31 @@
- 	goto done;
-     }
- 
--    /* At the point this has been called, the username has been canonified
--     * and we've done the auxprop lookup.  This should be easy. */
--    if(auxprop_values[0].name
--       && auxprop_values[0].values
--       && auxprop_values[0].values[0]
--       && !strcmp(auxprop_values[0].values[0], passwd)) {
--	/* We have a plaintext version and it matched! */
--	return SASL_OK;
-+
-+	/******************************
-+	 * crypt(3) patch start       *
-+	 ******************************/	
-+
-+	/* get salt */
-+	_sasl_get_salt(salt, (char *) auxprop_values[0].values[0], password_format);
-+	
-+	/* crypt(3)-ed password? */
-+	if (password_format != PASSWORD_FORMAT_CLEARTEXT) {
-+		/* compare password */
-+		if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(crypt(passwd, salt), auxprop_values[0].values[0]) == 0)
-+			return SASL_OK;
-+		else
-+			ret = SASL_BADAUTH;
-+	}
-+	else if (password_format == PASSWORD_FORMAT_CLEARTEXT) {
-+		/* compare passwords */
-+		if (auxprop_values[0].name && auxprop_values[0].values && auxprop_values[0].values[0] && strcmp(auxprop_values[0].values[0], passwd) == 0)
-+			return SASL_OK;
-+		else
-+			ret = SASL_BADAUTH;
-+	/******************************
-+	 * crypt(3) patch stop        *
-+	 ******************************/
-     } else if(auxprop_values[1].name
- 	      && auxprop_values[1].values
- 	      && auxprop_values[1].values[0]) {
-@@ -975,3 +1053,37 @@
- #endif     
-     { NULL, NULL }
- };
-+
-+/* weeds out crypt(3) password's salt */
-+int _sasl_get_salt (char *dest, char *src, int format) {
-+	int num;	/* how many characters is salt long? */
-+	switch (format) {
-+		case PASSWORD_FORMAT_CRYPT:
-+			/* md5 crypt */
-+			if (src[1] == '1')
-+				num = 12;
-+			/* blowfish crypt */
-+			else if (src[1] == '2')
-+				num = (src[1] == '2' && src[2] == 'a') ? 17 : 16;
-+			/* traditional crypt */
-+			else
-+				num = 2;
-+			break;
-+	
-+		case PASSWORD_FORMAT_CRYPTTRAD:
-+			num = 2;
-+			break;
-+
-+		default:
-+			return 1;
-+	}
-+
-+	/* destroy destination */
-+	memset(dest, '\0', (num + 1));
-+
-+	/* copy salt to destination */
-+	strncpy(dest, src, num);
-+
-+	return 1;
-+}
-+
diff --git a/testing/libsasl/cyrus-sasl-2.1.22-as-needed.patch b/testing/libsasl/cyrus-sasl-2.1.22-as-needed.patch
deleted file mode 100644
index 1294cb507..000000000
--- a/testing/libsasl/cyrus-sasl-2.1.22-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- saslauthd/configure.in.orig	2006-05-23 15:53:17.000000000 -0700
-+++ saslauthd/configure.in	2006-05-23 15:53:33.000000000 -0700
-@@ -77,7 +77,7 @@
-   AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support])
-   SASL_DB_PATH_CHECK()
-   SASL_DB_CHECK()
--  SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
-+  SASL_DB_LIB="../sasldb/.libs/libsasldb.a $SASL_DB_LIB"
- fi
- 
- AC_ARG_ENABLE(httpform, [  --enable-httpform       enable HTTP form authentication [[no]] ],
diff --git a/testing/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch b/testing/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch
deleted file mode 100644
index 8cd71c0c5..000000000
--- a/testing/libsasl/cyrus-sasl-2.1.22-automake-1.10.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Re-merged patch by Robert Scheck <redhat@linuxnetz.de> for cyrus-sasl >= 2.1.22, which was
-originally written by Jacek Konieczny <jajcus@pld-linux.org> and makes cyrus-sasl building
-using automake 1.10.
-
---- cyrus-sasl-2.1.22/plugins/Makefile.am		2006-05-17 18:46:16.000000000 +0200
-+++ cyrus-sasl-2.1.22/plugins/Makefile.am.am110		2007-02-16 15:42:07.000000000 +0100
-@@ -82,73 +82,73 @@
- 	libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
- 
- libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
--libplain_la_LDFLAGS = -version-info $(plain_version)
-+libplain_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(plain_version)
- libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
- libplain_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
- 
- libanonymous_la_SOURCES = anonymous.c anonymous_init.c $(common_sources)
--libanonymous_la_LDFLAGS = -version-info $(anonymous_version)
-+libanonymous_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(anonymous_version)
- libanonymous_la_DEPENDENCIES = $(COMPAT_OBJS)
- libanonymous_la_LIBADD = $(COMPAT_OBJS)
- 
- libkerberos4_la_SOURCES = kerberos4.c kerberos4_init.c $(common_sources)
--libkerberos4_la_LDFLAGS = -version-info $(kerberos4_version)
-+libkerberos4_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(kerberos4_version)
- libkerberos4_la_DEPENDENCIES = $(COMPAT_OBJS)
- libkerberos4_la_LIBADD = $(SASL_KRB_LIB) $(LIB_SOCKET) $(COMPAT_OBJS)
- 
- libgssapiv2_la_SOURCES = gssapi.c gssapiv2_init.c $(common_sources)
--libgssapiv2_la_LDFLAGS = -version-info $(gssapiv2_version)
-+libgssapiv2_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(gssapiv2_version)
- libgssapiv2_la_DEPENDENCIES = $(COMPAT_OBJS)
- libgssapiv2_la_LIBADD = $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(LIB_SOCKET) $(COMPAT_OBJS)
- 
- libcrammd5_la_SOURCES = cram.c crammd5_init.c $(common_sources)
--libcrammd5_la_LDFLAGS = -version-info $(crammd5_version)
-+libcrammd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(crammd5_version)
- libcrammd5_la_DEPENDENCIES = $(COMPAT_OBJS)
- libcrammd5_la_LIBADD = $(COMPAT_OBJS)
- 
- libdigestmd5_la_SOURCES = digestmd5.c digestmd5_init.c $(common_sources)
--libdigestmd5_la_LDFLAGS = -version-info $(digestmd5_version)
-+libdigestmd5_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(digestmd5_version)
- libdigestmd5_la_DEPENDENCIES = $(COMPAT_OBJS)
- libdigestmd5_la_LIBADD = $(LIB_DES) $(LIB_SOCKET) $(COMPAT_OBJS)
- 
- liblogin_la_SOURCES = login.c login_init.c $(common_sources)
--liblogin_la_LDFLAGS = -version-info $(login_version)
-+liblogin_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(login_version)
- liblogin_la_DEPENDENCIES = $(COMPAT_OBJS)
- liblogin_la_LIBADD = $(PLAIN_LIBS) $(COMPAT_OBJS)
- 
- libsrp_la_SOURCES = srp.c srp_init.c $(common_sources)
--libsrp_la_LDFLAGS = -version-info $(srp_version)
-+libsrp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(srp_version)
- libsrp_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsrp_la_LIBADD = $(SRP_LIBS) $(COMPAT_OBJS)
- 
- libotp_la_SOURCES = otp.c otp_init.c otp.h $(common_sources)
--libotp_la_LDFLAGS = -version-info $(otp_version)
-+libotp_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(otp_version)
- libotp_la_DEPENDENCIES = $(COMPAT_OBJS)
- libotp_la_LIBADD = $(OTP_LIBS) $(COMPAT_OBJS)
- 
- libntlm_la_SOURCES = ntlm.c ntlm_init.c $(common_sources)
--libntlm_la_LDFLAGS = -version-info $(ntlm_version)
-+libntlm_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(ntlm_version)
- libntlm_la_DEPENDENCIES = $(COMPAT_OBJS)
- libntlm_la_LIBADD = $(NTLM_LIBS) $(COMPAT_OBJS)
- 
- libpassdss_la_SOURCES = passdss.c passdss_init.c $(common_sources)
--libpassdss_la_LDFLAGS = -version-info $(passdss_version)
-+libpassdss_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(passdss_version)
- libpassdss_la_DEPENDENCIES = $(COMPAT_OBJS)
- libpassdss_la_LIBADD = $(PASSDSS_LIBS) $(COMPAT_OBJS)
- 
- # Auxprop Plugins
- libsasldb_la_SOURCES = sasldb.c sasldb_init.c $(common_sources)
--libsasldb_la_LDFLAGS = -version-info $(sasldb_version)
-+libsasldb_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(sasldb_version)
- libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
- 
- libldapdb_la_SOURCES = ldapdb.c ldapdb_init.c $(common_sources)
--libldapdb_la_LDFLAGS = $(LIB_LDAP) -version-info $(ldapdb_version)
-+libldapdb_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_LDAP) -version-info $(ldapdb_version)
- libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
- libldapdb_la_LIBADD = $(COMPAT_OBJS)
- 
- libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
--libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
-+libsql_la_LDFLAGS = $(AM_LDFLAGS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
- libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
- libsql_la_LIBADD = $(COMPAT_OBJS)
- 
diff --git a/testing/libsasl/cyrus-sasl-2.1.22-crypt.patch b/testing/libsasl/cyrus-sasl-2.1.22-crypt.patch
deleted file mode 100644
index fd356327b..000000000
--- a/testing/libsasl/cyrus-sasl-2.1.22-crypt.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-http://bugs.gentoo.org/152544
-
---- cyrus-sasl-2.1.22/lib/Makefile.am
-+++ cyrus-sasl-2.1.22/lib/Makefile.am
-@@ -45,6 +45,7 @@ sasl_version = 2:22:0
- 
- INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/plugins -I$(top_builddir)/include -I$(top_srcdir)/sasldb
- 
-+AM_CFLAGS = -fPIC
- EXTRA_DIST = windlopen.c staticopen.h NTMakefile
- EXTRA_LIBRARIES = libsasl2.a
- noinst_LIBRARIES = @SASL_STATIC_LIBS@
---- cyrus-sasl-2.1.22/plugins/Makefile.am
-+++ cyrus-sasl-2.1.22/plugins/Makefile.am
-@@ -63,6 +63,7 @@ srp_version = 2:22:0
- 
- INCLUDES=-I$(top_srcdir)/include -I$(top_srcdir)/lib -I$(top_srcdir)/sasldb -I$(top_builddir)/include
- AM_LDFLAGS = -module -export-dynamic -rpath $(plugindir)
-+AM_CFLAGS = -fPIC
- 
- COMPAT_OBJS = @LTGETADDRINFOOBJS@ @LTGETNAMEINFOOBJS@ @LTSNPRINTFOBJS@
- 
---- cyrus-sasl-2.1.22/sasldb/Makefile.am
-+++ cyrus-sasl-2.1.22/sasldb/Makefile.am
-@@ -48,6 +48,7 @@ INCLUDES=-I$(top_srcdir)/include -I$(top
- 
- extra_common_sources = db_none.c db_ndbm.c db_gdbm.c db_berkeley.c
- 
-+AM_CFLAGS = -fPIC
- EXTRA_DIST = NTMakefile
- 
- noinst_LTLIBRARIES = libsasldb.la
---- cyrus-sasl-2.1.22/utils/Makefile.am
-+++ cyrus-sasl-2.1.22/utils/Makefile.am
-@@ -42,7 +42,7 @@
- #
- ################################################################
- 
--all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET)
-+all_sasl_libs = ../lib/libsasl2.la $(SASL_DB_LIB) $(LIB_SOCKET) $(LIB_CRYPT)
- all_sasl_static_libs = ../lib/.libs/libsasl2.a $(SASL_DB_LIB) $(LIB_SOCKET) $(GSSAPIBASE_LIBS) $(GSSAPI_LIBS) $(SASL_KRB_LIB) $(LIB_DES) $(PLAIN_LIBS) $(SRP_LIBS) $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE)
- 
- sbin_PROGRAMS = @SASL_DB_UTILS@ @SMTPTEST_PROGRAM@ pluginviewer
---- cyrus-sasl-2.1.22/sample/Makefile.am
-+++ cyrus-sasl-2.1.22/sample/Makefile.am
-@@ -54,10 +54,10 @@ sample_server_SOURCES = sample-server.c
- server_SOURCES = server.c common.c common.h
- client_SOURCES = client.c common.c common.h
- 
--server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
--client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
-+server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
-+client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
- 
--sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
--sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET)
-+sample_client_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
-+sample_server_LDADD = ../lib/libsasl2.la $(LIB_SOCKET) $(LIB_CRYPT)
- 
- EXTRA_DIST = NTMakefile
---- cyrus-sasl-2.1.22/lib/Makefile.am
-+++ cyrus-sasl-2.1.22/lib/Makefile.am
-@@ -63,7 +63,7 @@ lib_LTLIBRARIES = libsasl2.la
- libsasl2_la_SOURCES = $(common_sources) $(common_headers)
- libsasl2_la_LDFLAGS = -version-info $(sasl_version)
- libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
--libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR)
-+libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT)
- 
- if MACOSX
- framedir = /Library/Frameworks/SASL2.framework
diff --git a/testing/libsasl/cyrus-sasl-2.1.22-qa.patch b/testing/libsasl/cyrus-sasl-2.1.22-qa.patch
deleted file mode 100644
index 4f7b04f13..000000000
--- a/testing/libsasl/cyrus-sasl-2.1.22-qa.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix missing prototype warnings
-
---- cyrus-sasl-2.1.22/lib/auxprop.c
-+++ cyrus-sasl-2.1.22/lib/auxprop.c
-@@ -43,6 +43,7 @@
-  */
- 
- #include <config.h>
-+#include <stdio.h>
- #include <sasl.h>
- #include <prop.h>
- #include <ctype.h>
---- cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
-+++ cyrus-sasl-2.1.22/pwcheck/pwcheck_getspnam.c
-@@ -24,6 +24,7 @@ OF OR IN CONNECTION WITH THE USE OR PERF
- ******************************************************************/
- 
- #include <shadow.h>
-+#include <string.h>
- 
- extern char *crypt();
- 
diff --git a/testing/libsasl/cyrus-sasl-2.1.23-authd-fix.patch b/testing/libsasl/cyrus-sasl-2.1.23-authd-fix.patch
deleted file mode 100644
index f5f372d17..000000000
--- a/testing/libsasl/cyrus-sasl-2.1.23-authd-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-fix warnings:
-
-auth_sasldb.c: In function ‘auth_sasldb’:
-auth_sasldb.c:144: warning: implicit declaration of function ‘gethostname’
-
-auth_sasldb.c:153: warning: passing argument 8 of ‘_sasldb_getdata’ from incompatible pointer type
-../sasldb/sasldb.h:60: note: expected ‘size_t *’ but argument is of type ‘int *’
-
---- saslauthd/auth_sasldb.c
-+++ saslauthd/auth_sasldb.c
-@@ -41,6 +41,7 @@
- #include <string.h>
- #include <stdlib.h>
- #include <pwd.h>
-+#include <unistd.h>
- /* END PUBLIC DEPENDENCIES */
- 
- #define RETURN(x) return strdup(x)
-@@ -131,7 +132,8 @@
-     /* VARIABLES */
-     char pw[1024];			/* pointer to passwd file entry */
-     sasl_utils_t utils;
--    int ret, outsize;
-+    int ret;
-+    size_t outsize;
-     const char *use_realm;
-     char realm_buf[MAXHOSTNAMELEN];
-     /* END VARIABLES */
diff --git a/testing/libsasl/saslauthd b/testing/libsasl/saslauthd
deleted file mode 100644
index 6afafae0b..000000000
--- a/testing/libsasl/saslauthd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/saslauthd ] && . /etc/conf.d/saslauthd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME="saslauthd"
-SASLAUTHD_BIN=/usr/sbin/saslauthd
-SASLAUTHD_RUN=/var/run/saslauthd
-SASLAUTHD_PID=$SASLAUTHD_RUN/saslauthd.pid
-
-case "$1" in
-  start)
-    stat_busy "Starting $DAEMON_NAME"
-    [ ! -d /var/run/saslauthd ] && install -d /var/run/saslauthd
-    if $SASLAUTHD_BIN $SASLAUTHD_OPTS >/dev/null; then
-      add_daemon $DAEMON_NAME
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $DAEMON_NAME"
-    [ -f $SASLAUTHD_PID ] && kill `cat $SASLAUTHD_PID` &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm_daemon $DAEMON_NAME
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-# vim: ts=2 sw=2 et ft=sh
diff --git a/testing/libsasl/saslauthd.conf.d b/testing/libsasl/saslauthd.conf.d
deleted file mode 100644
index 167211290..000000000
--- a/testing/libsasl/saslauthd.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-SASLAUTHD_OPTS="-a pam"
diff --git a/testing/libsocialweb/PKGBUILD b/testing/libsocialweb/PKGBUILD
deleted file mode 100644
index 9860ef2cd..000000000
--- a/testing/libsocialweb/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 139006 2011-09-28 19:32:26Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-pkgname=libsocialweb
-pkgver=0.25.19
-pkgrel=2
-pkgdesc="A personal social data server"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring'
-         'json-glib')
-makedepends=('intltool' 'gtk-doc' 'vala' 'gobject-introspection')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('377b165fed92e1d4f6c7a2430191388633ad25421a72d640e9e60dfdf1d54625')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/libsocialweb \
-    --enable-all-services=yes \
-    --with-online=always \
-    --enable-vala-bindings
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libsoup/PKGBUILD b/testing/libsoup/PKGBUILD
deleted file mode 100644
index 57fe74d4a..000000000
--- a/testing/libsoup/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 139008 2011-09-28 19:32:28Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libsoup
-pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.36.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('db06af0f8c887abde427e5418e0e74bd39837a0f48a4161ff29607dfcd6b36ca')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package_libsoup() {
-  pkgdesc="GNOME HTTP Library - base library"
-  depends=('glib2' 'libxml2' 'glib-networking')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}"/usr/lib/libsoup-gnome-2.4.*
-  rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-gnome-2.4.pc"
-  rm -rf "${pkgdir}/usr/include/libsoup-gnome-2.4"
-  rm -f "${pkgdir}/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib"
-}
-
-package_libsoup-gnome() {
-  pkgdesc="GNOME HTTP Library - GNOME libraries"
-  depends=("libsoup=${pkgver}" 'libgnome-keyring')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}"/usr/lib/libsoup-2.4.*
-  rm -f "${pkgdir}/usr/lib/pkgconfig/libsoup-2.4.pc"
-  rm -rf "${pkgdir}/usr/include/libsoup-2.4"
-  rm -rf "${pkgdir}/usr/share"
-  rm -f "${pkgdir}/usr/lib/girepository-1.0/Soup-2.4.typelib"
-}
diff --git a/testing/libwebkit/PKGBUILD b/testing/libwebkit/PKGBUILD
deleted file mode 100644
index b3e0d56b0..000000000
--- a/testing/libwebkit/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 139010 2011-09-28 19:32:30Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=libwebkit
-pkgname=(libwebkit libwebkit3)
-pkgver=1.6.1
-pkgrel=1
-pkgdesc="An opensource web content engine"
-arch=('i686' 'x86_64')
-url="http://webkitgtk.org/"
-license=('custom')
-depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant')
-makedepends=('gperf' 'gtk-doc' 'gobject-introspection' 'python2' 'gtk2' 'gtk3')
-options=('!libtool' '!emptydirs')
-install=libwebkit.install
-source=(http://webkitgtk.org/webkit-${pkgver}.tar.gz)
-md5sums=('c11743694b1b71dad287b2e7a9e73b05')
-
-build() {
-  cd "${srcdir}/webkit-${pkgver}"
-  mkdir build-gtk{2,3}
-
-  ( cd build-gtk2 && _build --with-gtk=2.0 )
-  ( cd build-gtk3 && _build --with-gtk=3.0 )
-}
-
-_build() {
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --with-font-backend=freetype --enable-gtk-doc \
-    --with-unicode-backend=icu \
-    --enable-spellcheck "$@"
-  make all stamp-po
-}
-
-package_libwebkit() {
-  pkgdesc+=" (for GTK2)"
-  depends+=(gtk2)
-
-  cd "$srcdir/webkit-$pkgver/build-gtk2"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit/LICENSE"
-}
-
-package_libwebkit3() {
-  pkgdesc+=" (for GTK3)"
-  depends+=(gtk3)
-
-  cd "${srcdir}/webkit-${pkgver}/build-gtk3"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 ../Source/WebKit/LICENSE "${pkgdir}/usr/share/licenses/libwebkit3/LICENSE"
-}
diff --git a/testing/libwebkit/libwebkit.install b/testing/libwebkit/libwebkit.install
deleted file mode 100644
index 24072f316..000000000
--- a/testing/libwebkit/libwebkit.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/libwnck3/PKGBUILD b/testing/libwnck3/PKGBUILD
deleted file mode 100644
index 1f1b0535d..000000000
--- a/testing/libwnck3/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 139012 2011-09-28 19:32:32Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=libwnck3
-_pkgbasename=libwnck
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Window Navigator Construction Kit (GTK+3)"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('gtk3' 'startup-notification' 'libxres')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-url="http://www.gnome.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz)
-sha256sums=('7cb92e6dbe8f20f4dba327fa078fb3caa35c0ae89445bbbdf1e7a17e5116f542')
-
-build() {
-    cd "${srcdir}/${_pkgbasename}-${pkgver}"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --localstatedir=/var --disable-static
-    make
-}
-
-package() {
-    cd "${srcdir}/${_pkgbasename}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/logrotate/PKGBUILD b/testing/logrotate/PKGBUILD
deleted file mode 100644
index 2da367ba7..000000000
--- a/testing/logrotate/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 138778 2011-09-28 06:05:56Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=logrotate
-pkgver=3.8.1
-pkgrel=1
-pkgdesc="Rotates system logs automatically"
-arch=('i686' 'x86_64')
-url="https://fedorahosted.org/logrotate/"
-license=('GPL')
-groups=('base')
-depends=('popt' 'cron' 'gzip')
-backup=('etc/logrotate.conf')
-source=(https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz
-        logrotate-3.8.1-noasprintf.patch
-        logrotate.conf
-        logrotate.cron.daily)
-md5sums=('bd2e20d8dc644291b08f9215397d28a5'
-         'fc8e4e15211d8aefd431d0e2e96223c4'
-         '462a5f364717461537eb2ae6394ad23e'
-         '8e23d5d4cc29b1e055b24df87e355cdc')
-
-build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-
-  patch -p1 -i "$srcdir"/logrotate-3.8.1-noasprintf.patch
-
-  sed -i 's|#define DEFAULT_MAIL_COMMAND .*|#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"|'\
-    config.h
-  sed -i "s|CFLAGS = -Wall|CFLAGS = -Wall $CFLAGS|" Makefile
-  sed -i 's|$(BASEDIR)/man|$(BASEDIR)/share/man|' Makefile
-  
-  make
-}
-
-check() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make PREFIX="$pkgdir" install
-
-  install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf"
-  install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate"
-}
diff --git a/testing/logrotate/logrotate-3.8.1-noasprintf.patch b/testing/logrotate/logrotate-3.8.1-noasprintf.patch
deleted file mode 100644
index be0c08062..000000000
--- a/testing/logrotate/logrotate-3.8.1-noasprintf.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- logrotate-3.8.0.orig/config.c	2011-06-21 04:12:02.000000000 -0400
-+++ logrotate-3.8.0/config.c	2011-07-12 13:47:36.274319050 -0400
-@@ -41,39 +41,6 @@
- #include "asprintf.c"
- #endif
- 
--#if !defined(asprintf)
--#include <stdarg.h>
--
--int asprintf(char **string_ptr, const char *format, ...)
--{
--	va_list arg;
--	char *str;
--	int size;
--	int rv;
--
--	va_start(arg, format);
--	size = vsnprintf(NULL, 0, format, arg);
--	size++;
--	va_start(arg, format);
--	str = malloc(size);
--	if (str == NULL) {
--		va_end(arg);
--		/*
--		 * Strictly speaking, GNU asprintf doesn't do this,
--		 * but the caller isn't checking the return value.
--		 */
--		fprintf(stderr, "failed to allocate memory\\n");
--		exit(1);
--	}
--	rv = vsnprintf(str, size, format, arg);
--	va_end(arg);
--
--	*string_ptr = str;
--	return (rv);
--}
--
--#endif
--
- #if !defined(strndup)
- char *strndup(const char *s, size_t n)
- {
---- logrotate-3.8.0.orig/logrotate.h	2011-06-21 04:12:02.000000000 -0400
-+++ logrotate-3.8.0/logrotate.h	2011-07-12 13:47:38.949285608 -0400
-@@ -66,8 +66,5 @@ extern int numLogs;
- extern int debug;
- 
- int readAllConfigPaths(const char **paths);
--#if !defined(asprintf)
--int asprintf(char **string_ptr, const char *format, ...);
--#endif
- 
- #endif
diff --git a/testing/logrotate/logrotate.conf b/testing/logrotate/logrotate.conf
deleted file mode 100644
index 88b4935cd..000000000
--- a/testing/logrotate/logrotate.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# see "man logrotate" for details
-# rotate log files weekly
-weekly
-
-# keep 4 weeks worth of backlogs
-rotate 4
-
-# restrict maximum size of log files
-#size 20M
-
-# create new (empty) log files after rotating old ones
-create
-
-# uncomment this if you want your log files compressed
-#compress
-
-# Logs are moved into directory for rotation
-# olddir /var/log/archive
-
-# Ignore pacman saved files
-tabooext + .pacorig .pacnew .pacsave
-
-# Arch packages drop log rotation information into this directory
-include /etc/logrotate.d
-
-/var/log/wtmp {
-    monthly
-    create 0664 root root
-    rotate 1
-}
-
diff --git a/testing/logrotate/logrotate.cron.daily b/testing/logrotate/logrotate.cron.daily
deleted file mode 100755
index e8ab921ea..000000000
--- a/testing/logrotate/logrotate.cron.daily
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/sbin/logrotate /etc/logrotate.conf
diff --git a/testing/mash/PKGBUILD b/testing/mash/PKGBUILD
deleted file mode 100644
index a25dd02f3..000000000
--- a/testing/mash/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 139014 2011-09-28 19:32:33Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=mash
-pkgver=0.1.0
-pkgrel=2
-pkgdesc="A small library for using 3D models within a Clutter scene"
-arch=('i686' 'x86_64')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('clutter')
-makedepends=('gtk-doc' 'gobject-introspection')
-source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('81f4b01d5661010dd742d4a82f9af4555624601ba3fb4e0780cfe2b34c13c24f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mousetweaks/PKGBUILD b/testing/mousetweaks/PKGBUILD
deleted file mode 100644
index c88446181..000000000
--- a/testing/mousetweaks/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 2392 2008-06-01 19:38:25Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=mousetweaks
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
-arch=(i686 x86_64)
-license=('GPL3' 'FDL')
-depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas')
-makedepends=('gnome-doc-utils' 'intltool')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=mousetweaks.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('65aeb0fb2c2eb5f0b06ec3aa8de5b3e2ccab02edd3a4a30adb7ef224baa74649')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mousetweaks/mousetweaks.install b/testing/mousetweaks/mousetweaks.install
deleted file mode 100644
index 1ae919322..000000000
--- a/testing/mousetweaks/mousetweaks.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall mousetweaks
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD
deleted file mode 100644
index b776ffbce..000000000
--- a/testing/mpfr/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 140158 2011-10-08 00:54:01Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=mpfr
-_pkgver=3.1.0
-_patchlevel=p1
-pkgver=${_pkgver}.${_patchlevel}
-pkgrel=1
-pkgdesc="Multiple-precision floating-point library"
-arch=('i686' 'x86_64')
-url="http://www.mpfr.org/"
-license=('LGPL')
-depends=('gmp>=5.0')
-options=('!libtool')
-install=mpfr.install
-source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz
-        mpfr-${_pkgver}.${_patchlevel}.patch)
-md5sums=('6e495841bb026481567006cec0f821c3'
-         'ec988293368d4988c76f50d6a3460166')
-
-build() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  patch -Np1 -i $srcdir/mpfr-${_pkgver}.${_patchlevel}.patch
-  ./configure --prefix=/usr --enable-thread-safe --enable-shared
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mpfr/mpfr-3.1.0.p1.patch b/testing/mpfr/mpfr-3.1.0.p1.patch
deleted file mode 100644
index 437b1a278..000000000
--- a/testing/mpfr/mpfr-3.1.0.p1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-10-05 21:39:57.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_unlikely
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-03 08:17:15.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-10-05 21:39:57.000000000 +0000
-@@ -1 +1 @@
--3.1.0
-+3.1.0-p1
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
-@@ -988,10 +988,11 @@
-  ******************************************************/
- 
- /* Theses macros help the compiler to determine if a test is
-- * likely or unlikely. */
-+   likely or unlikely. The !! is necessary in case x is larger
-+   than a long. */
- #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0)
- # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1))
--# define MPFR_UNLIKELY(x) (__builtin_expect((x),0))
-+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0))
- #else
- # define MPFR_LIKELY(x) (x)
- # define MPFR_UNLIKELY(x) (x)
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0"
-+#define MPFR_VERSION_STRING "3.1.0-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-10-05 21:39:57.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0";
-+  return "3.1.0-p1";
- }
diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install
deleted file mode 100644
index d6dd0475b..000000000
--- a/testing/mpfr/mpfr.install
+++ /dev/null
@@ -1,20 +0,0 @@
-info_dir=usr/share/info
-info_files=(mpfr.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/testing/mutter/PKGBUILD b/testing/mutter/PKGBUILD
deleted file mode 100644
index 0e5632001..000000000
--- a/testing/mutter/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 139018 2011-09-28 19:32:37Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
-
-pkgname=mutter
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="A window manager for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'clutter' 'gobject-introspection')
-makedepends=('intltool' 'gnome-doc-utils')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=mutter.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('225edd0dd1cdcc44e3220075728a07de7bafb8aa7e798583aa7602dcd45237c3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/mutter \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain mutter ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/mutter/mutter.install b/testing/mutter/mutter.install
deleted file mode 100644
index 199f12584..000000000
--- a/testing/mutter/mutter.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=mutter
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/mx/PKGBUILD b/testing/mx/PKGBUILD
deleted file mode 100644
index 2e54aaed8..000000000
--- a/testing/mx/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 139020 2011-09-28 19:32:39Z ibiru $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Guenther Wutz <admin@wutzara.de>
-
-pkgname=mx
-pkgver=1.3.1
-pkgrel=2
-pkgdesc="A widget toolkit using Clutter"
-arch=('i686' 'x86_64')
-url="http://www.clutter-project.org"
-license=('LGPL')
-depends=('clutter' 'libxrandr' 'dbus-glib' 'gtk2' 'startup-notification')
-makedepends=('intltool' 'gobject-introspection' 'gtk-doc')
-options=('!libtool')
-source=("http://source.clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
-sha256sums=('4fab2d721252afe041165b909c503cca80e426aeeeb9f46676365ec25bb51cfa')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/nautilus-open-terminal/PKGBUILD b/testing/nautilus-open-terminal/PKGBUILD
deleted file mode 100644
index 9fdc312fe..000000000
--- a/testing/nautilus-open-terminal/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 139113 2011-09-29 14:24:25Z ibiru $
-# Maintainer : Biru Ionut <ionut@archlinux.ro>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-pkgname=nautilus-open-terminal
-pkgver=0.19
-pkgrel=2
-pkgdesc="A nautilus plugin for opening terminals in arbitrary local paths"
-arch=('i686' 'x86_64')
-url="http://ftp.gnome.org/pub/GNOME/sources/nautilus-open-terminal"
-license=('GPL')
-depends=('nautilus' 'gconf')
-makedepends=('pkgconfig' 'gettext' 'intltool')
-install=nautilus-open-terminal.install
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool')
-sha256sums=('4760f3a5a862ba9239ea92690a42ecee2c68fad413b023dd06505bdb3ee1f6af')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -dm755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ${pkgname} "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -rf "${pkgdir}"/etc/gconf/schemas
-}
diff --git a/testing/nautilus-open-terminal/nautilus-open-terminal.install b/testing/nautilus-open-terminal/nautilus-open-terminal.install
deleted file mode 100644
index f7cdb9507..000000000
--- a/testing/nautilus-open-terminal/nautilus-open-terminal.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=nautilus-open-terminal
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/testing/nautilus-sendto/PKGBUILD b/testing/nautilus-sendto/PKGBUILD
deleted file mode 100644
index 849885f12..000000000
--- a/testing/nautilus-sendto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 139024 2011-09-28 19:32:43Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Eduardo Romero <eduardo@archlinux.org>
-# Contributor: Tor Krill <tor@krill.nu>
-
-pkgname=nautilus-sendto
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="Nautilus context menu for sending files."
-arch=('i686' 'x86_64')
-url="http://download.gnome.org/sources/nautilus-sendto/"
-license=('GPL')
-groups=('gnome-extra')
-depends=('evolution-data-server' 'nautilus' 'dconf')
-makedepends=('pidgin' 'gajim' 'gettext' 'intltool')
-options=('!libtool' '!emptydirs')
-install=nautilus-sendto.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('34617084b731db8bf3ffb517497d5645283f4aa7a9ebfa2a05da8c12066a0f14')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/nautilus-sendto/nautilus-sendto.install b/testing/nautilus-sendto/nautilus-sendto.install
deleted file mode 100644
index e5204bcab..000000000
--- a/testing/nautilus-sendto/nautilus-sendto.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/nautilus/PKGBUILD b/testing/nautilus/PKGBUILD
deleted file mode 100644
index ba0db042c..000000000
--- a/testing/nautilus/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 139022 2011-09-28 19:32:41Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=nautilus
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="GNOME file manager"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql')
-makedepends=('intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('0eefea717d0b8fa360a50c493875cd146de05cc61b67b426d770ab5ba57541cd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/nautilus \
-      --disable-nst-extension \
-      --disable-update-mimedb \
-      --disable-packagekit \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/nautilus/nautilus.install b/testing/nautilus/nautilus.install
deleted file mode 100644
index 631e38649..000000000
--- a/testing/nautilus/nautilus.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall nautilus
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/net-snmp/PKGBUILD b/testing/net-snmp/PKGBUILD
deleted file mode 100644
index 4f3080b9e..000000000
--- a/testing/net-snmp/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 139145 2011-09-30 09:12:20Z eric $
-# Maintainer: 
-# Contributor: Dale Blount <dale@archlinux.org>
-
-pkgname=net-snmp
-pkgver=5.7.1
-pkgrel=1
-pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
-arch=('i686' 'x86_64')
-url="http://www.net-snmp.org/"
-license=('BSD')
-depends=('openssl' 'libnl' 'pciutils')
-makedepends=('python2-distribute')
-optdepends=('perl-term-readkey: for snmpcheck application' 
-            'perl-tk: for snmpcheck and tkmib applications'
-            'python2: for the python modules')
-provides=('ucd-snmp')
-backup=('etc/conf.d/snmpd')
-options=('!libtool' '!makeflags' '!emptydirs')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
-        snmpd.confd snmpd.rc)
-sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a'
-          '2bdc2839ce09d7daa608cd54687fa8beb47ed907'
-          'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b'
-          '90600c0141eed10d6e3ca3ccc97ad8dda15c2112')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in
-  PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --mandir=/usr/share/man \
-    --enable-ucd-snmp-compatibility \
-    --enable-ipv6 \
-    --with-python-modules \
-    --with-default-snmp-version="3" \
-    --with-sys-contact="root@localhost" \
-    --with-sys-location="Unknown" \
-    --with-logfile="/var/log/snmpd.log" \
-    --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \
-    --with-persistent-directory="/var/net-snmp"
-  make NETSNMP_DONT_CHECK_VERSION=1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install
-  install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
-  install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/net-snmp/snmpd.confd b/testing/net-snmp/snmpd.confd
deleted file mode 100644
index 926b09bbf..000000000
--- a/testing/net-snmp/snmpd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters to be passed to snmpd
-#
-SNMPD_ARGS=""
-
diff --git a/testing/net-snmp/snmpd.rc b/testing/net-snmp/snmpd.rc
deleted file mode 100644
index b00c09f4f..000000000
--- a/testing/net-snmp/snmpd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/snmpd
-
-PID=`pidof -o %PPID /usr/sbin/snmpd`
-case "$1" in
-  start)
-    stat_busy "Starting Net-SNMP"
-    [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/snmpd.pid
-      add_daemon snmpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Net-SNMP"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/snmpd.pid
-      rm_daemon snmpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/net-tools/PKGBUILD b/testing/net-tools/PKGBUILD
deleted file mode 100644
index c12969f29..000000000
--- a/testing/net-tools/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 136068 2011-08-22 12:40:31Z allan $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=net-tools
-pkgver=1.60.20110819cvs
-pkgrel=1
-pkgdesc="Configuration tools for Linux networking"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://www.tazenda.demon.co.uk/phil/net-tools"
-depends=('glibc')
-
-# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
-# use cvs checkout instead
-source=(ftp://ftp.archlinux.org/other/net-tools/net-tools-1.60.20110819cvs.tar.bz2
-  net-tools-1.60-miiioctl.patch
-  net-tools-1.60-nameif_strncpy.patch)
-options=(!makeflags)
-install=net-tools.install
-sha1sums=('02946449191ff279f9f0f7fd7bc65ae21059a2bf'
-          '654a96bc6575efb4a2e04b49de45d448d240eb6e'
-          '7888000d8fe867e58b5b00fe2bcf6c3041d716b4')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ../net-tools-1.60-miiioctl.patch
-  patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch
-  yes "" | make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make BASEDIR=$pkgdir update
-
-  # the following is provided by yp-tools
-  rm "${pkgdir}"/bin/{nis,yp}domainname
-  rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1
-
-  # hostname is provided by inetutils
-  rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname}
-  rm -rf "${pkgdir}"/usr/share/man/man1
-}
diff --git a/testing/net-tools/gcc340.patch b/testing/net-tools/gcc340.patch
deleted file mode 100644
index 8089bf217..000000000
--- a/testing/net-tools/gcc340.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naur net-tools-1.60-orig/hostname.c net-tools-1.60/hostname.c
---- net-tools-1.60-orig/hostname.c	2001-04-08 10:04:23.000000000 -0700
-+++ net-tools-1.60/hostname.c	2004-05-07 17:22:14.000000000 -0700
-@@ -78,6 +78,7 @@
-             fprintf(stderr, _("%s: name too long\n"), program_name);
-             break;
-         default:
-+	    ;
-         }
- 	exit(1);
-     }
-@@ -98,6 +99,7 @@
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
- 	default:
-+	    ;
- 	}
- 	exit(1);
-     };
-@@ -117,6 +119,7 @@
- 	    fprintf(stderr, _("%s: name too long\n"), program_name);
- 	    break;
- 	default:
-+	    ;
- 	}
- 	exit(1);
-     };
-@@ -174,6 +177,7 @@
- 	printf("%s\n", hp->h_name);
- 	break;
-     default:
-+	;
-     }
- }
- 
-diff -Naur net-tools-1.60-orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c
---- net-tools-1.60-orig/lib/inet_sr.c	2000-02-20 13:46:45.000000000 -0800
-+++ net-tools-1.60/lib/inet_sr.c	2004-05-07 17:20:14.000000000 -0700
-@@ -105,6 +105,7 @@
-     case 2:
-        isnet = 0; break;
-     default:
-+       ;
-     }
- 
-     /* Fill in the other fields. */
diff --git a/testing/net-tools/net-tools-1.60-2.6-compilefix.patch b/testing/net-tools/net-tools-1.60-2.6-compilefix.patch
deleted file mode 100644
index 92ce90128..000000000
--- a/testing/net-tools/net-tools-1.60-2.6-compilefix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruN net-tools-1.60.orig/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c
---- net-tools-1.60.orig/lib/x25_sr.c	2000-05-20 15:38:10.000000000 +0200
-+++ net-tools-1.60/lib/x25_sr.c	2003-10-18 20:33:31.927574928 +0200
-@@ -22,6 +22,7 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <linux/x25.h>
-+#include <linux/version.h>
- #include <ctype.h>
- #include <errno.h>
- #include <netdb.h>
-@@ -77,7 +78,11 @@
-   rt.sigdigits=sigdigits;
- 
-   /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
-   memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
-+#else
-+  memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
-+#endif
- 
-   while (*args) {
- 	if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
diff --git a/testing/net-tools/net-tools-1.60-miiioctl.patch b/testing/net-tools/net-tools-1.60-miiioctl.patch
deleted file mode 100644
index 6c7f0693d..000000000
--- a/testing/net-tools/net-tools-1.60-miiioctl.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- net-tools-1.60.20110819cvs/include/mii.h	2011-08-19 10:14:00.743873299 +0200
-+++ net-tools-1.60.20110819cvs/include/mii.h.new	2011-08-19 10:28:26.500524160 +0200
-@@ -14,11 +14,9 @@
- /* network interface ioctl's for MII commands */
- #ifndef SIOCGMIIPHY
- #warning "SIOCGMIIPHY is not defined by your kernel source"
--#define SIOCGMIIPHY (SIOCDEVPRIVATE)	/* Read from current PHY */
--#define SIOCGMIIREG (SIOCDEVPRIVATE+1) 	/* Read any PHY register */
--#define SIOCSMIIREG (SIOCDEVPRIVATE+2) 	/* Write any PHY register */
--#define SIOCGPARAMS (SIOCDEVPRIVATE+3) 	/* Read operational parameters */
--#define SIOCSPARAMS (SIOCDEVPRIVATE+4) 	/* Set operational parameters */
-+#define SIOCGMIIPHY 0x8947     /* Read from current PHY */
-+#define SIOCGMIIREG 0x8948     /* Read any PHY register */
-+#define SIOCSMIIREG 0x8949     /* Write any PHY register */
- #endif
- 
- #include <linux/types.h>
diff --git a/testing/net-tools/net-tools-1.60-nameif.patch b/testing/net-tools/net-tools-1.60-nameif.patch
deleted file mode 100644
index 54def00c2..000000000
--- a/testing/net-tools/net-tools-1.60-nameif.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- net-tools-1.60/nameif.c.nameif	2000-10-18 19:26:29.000000000 +0200
-+++ net-tools-1.60/nameif.c	2003-03-19 11:02:01.000000000 +0100
-@@ -117,7 +117,8 @@
- }
- 
- struct change { 
--	struct change *next,**pprev;
-+	struct change *next;
-+	int found;
- 	char ifname[IFNAMSIZ+1];
- 	unsigned char mac[6];
- }; 
-@@ -139,10 +140,7 @@
- 			ch->ifname, pos); 
- 	if (parsemac(p,ch->mac) < 0) 
- 		complain(_("cannot parse MAC `%s' at %s"), p, pos); 
--	if (clist) 
--		clist->pprev = &ch->next;
- 	ch->next = clist;
--	ch->pprev = &clist;
- 	clist = ch;
- 	return 0; 
- }
-@@ -200,7 +198,7 @@
- 
- void usage(void)
- {
--	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}")); 
-+	fprintf(stderr, _("usage: nameif [-c configurationfile] [-s] {ifname macaddress}\n")); 
- 	exit(1); 
- }
- 
-@@ -277,21 +275,21 @@
- 		ch = lookupmac(mac); 
- 		if (!ch) 
- 			continue;
--			
--		*ch->pprev = ch->next;
-+		
-+		ch->found = 1;	
- 		if (strcmp(p, ch->ifname)) { 
- 			if (setname(p, ch->ifname) < 0)  
- 				complain(_("cannot change name of %s to %s: %s"),
- 						p, ch->ifname, strerror(errno)); 
- 		} 
--		free(ch);
- 	} 
- 	fclose(ifh); 
- 	
- 	while (clist) { 
- 		struct change *ch = clist;
- 		clist = clist->next;
--		warning(_("interface '%s' not found"), ch->ifname); 
-+		if (!ch->found)
-+			warning(_("interface '%s' not found"), ch->ifname); 
- 		free(ch); 
- 	}
- 
diff --git a/testing/net-tools/net-tools-1.60-nameif_strncpy.patch b/testing/net-tools/net-tools-1.60-nameif_strncpy.patch
deleted file mode 100644
index 7568e21a2..000000000
--- a/testing/net-tools/net-tools-1.60-nameif_strncpy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- net-tools-1.60/nameif.c.ncpy	2006-10-03 14:24:21.000000000 +0200
-+++ net-tools-1.60/nameif.c	2006-10-03 14:22:43.000000000 +0200
-@@ -100,8 +100,8 @@
- 	struct ifreq ifr;
- 	opensock(); 
- 	memset(&ifr,0,sizeof(struct ifreq));
--	strcpy(ifr.ifr_name, oldname); 
--	strcpy(ifr.ifr_newname, newname); 
-+	strncpy(ifr.ifr_name, oldname, IF_NAMESIZE); 
-+	strncpy(ifr.ifr_newname, newname, IF_NAMESIZE); 
- 	return ioctl(ctl_sk, SIOCSIFNAME, &ifr);
- }
- 
diff --git a/testing/net-tools/net-tools.install b/testing/net-tools/net-tools.install
deleted file mode 100644
index 9eee9e51b..000000000
--- a/testing/net-tools/net-tools.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then
-    echo "hostname and {,yp,nis}domainname has moved:"
-    echo "----------"
-    echo "hostname is now in coreutils"
-    echo "domainname is now in yp-tools"
-    echo "their functionality might have changed slightly"
-    echo ""
-    echo "dnsdomainname remains in net-tools"
-    echo "----------"
-  fi
-}
diff --git a/testing/net-tools/net-tools.patch b/testing/net-tools/net-tools.patch
deleted file mode 100644
index 8af2d2159..000000000
--- a/testing/net-tools/net-tools.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur net-tools-1.60-orig/mii-tool.c net-tools-1.60/mii-tool.c
---- net-tools-1.60-orig/mii-tool.c	2000-05-21 07:31:17.000000000 -0700
-+++ net-tools-1.60/mii-tool.c	2004-05-31 12:35:21.000000000 -0700
-@@ -379,16 +379,16 @@
- /*--------------------------------------------------------------------*/
- 
- const char *usage =
--"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
--       -V, --version               display version information
--       -v, --verbose               more verbose output
--       -R, --reset                 reset MII to poweron state
--       -r, --restart               restart autonegotiation
--       -w, --watch                 monitor for link status changes
--       -l, --log                   with -w, write events to syslog
--       -A, --advertise=media,...   advertise only specified media
--       -F, --force=media           force specified media technology
--media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
-+"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n\
-+       -V, --version               display version information\n\
-+       -v, --verbose               more verbose output\n\
-+       -R, --reset                 reset MII to poweron state\n\
-+       -r, --restart               restart autonegotiation\n\
-+       -w, --watch                 monitor for link status changes\n\
-+       -l, --log                   with -w, write events to syslog\n\
-+       -A, --advertise=media,...   advertise only specified media\n\
-+       -F, --force=media           force specified media technology\n\
-+media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n\
-        (to advertise both HD and FD) 100baseTx, 10baseT\n";
- 
- int main(int argc, char **argv)
diff --git a/testing/network-manager-applet/PKGBUILD b/testing/network-manager-applet/PKGBUILD
deleted file mode 100644
index 114a54e46..000000000
--- a/testing/network-manager-applet/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 139028 2011-09-28 19:32:47Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@archlinux.org>
-# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-# Contributor: Tor Krill <tor@krill.nu>
-# Contributor: Will Rea <sillywilly@gmail.com>
-
-pkgname=network-manager-applet
-pkgver=0.9.1.90
-pkgrel=1
-pkgdesc="GNOME frontends to NetWorkmanager"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' 'mobile-broadband-provider-info' 'gconf' 'iso-codes')
-makedepends=('intltool' 'gnome-bluetooth')
-optdepends=('gnome-bluetooth: for PAN/DUN support')
-options=('!libtool')
-install=network-manager-applet.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
-sha256sums=('e98d285cc75a331557551900ebd815c24cb3132027f981823af4fb76ec368d95')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/networkmanager \
-      --disable-static \
-      --disable-maintainer-mode
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain nm-applet ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/network-manager-applet/network-manager-applet.install b/testing/network-manager-applet/network-manager-applet.install
deleted file mode 100644
index 9922d12b2..000000000
--- a/testing/network-manager-applet/network-manager-applet.install
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgname=network-manager-applet
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
diff --git a/testing/networkmanager/NetworkManager.conf b/testing/networkmanager/NetworkManager.conf
deleted file mode 100644
index c37b59680..000000000
--- a/testing/networkmanager/NetworkManager.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile
diff --git a/testing/networkmanager/PKGBUILD b/testing/networkmanager/PKGBUILD
deleted file mode 100644
index 32f5cb636..000000000
--- a/testing/networkmanager/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 139026 2011-09-28 19:32:45Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinxu.org>
-# Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-# Contributor: Tor Krill <tor@krill.nu>
-# Contributor: Will Rea <sillywilly@gmail.com>
-# Contributor: Valentine Sinitsyn <e_val@inbox.ru>
-
-pkgname=networkmanager
-pkgver=0.9.1.90
-pkgrel=1
-pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd')
-makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection')
-optdepends=('modemmanager: for modem management service'
-            'dhclient: alternative DHCP/DHCPv6 client'
-            'iptables: Connection sharing'
-            'dnsmasq: Connection sharing'
-            'bluez: Bluetooth support')
-options=('!libtool')
-backup=('etc/NetworkManager/NetworkManager.conf')
-install=networkmanager.install
-source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz
-        NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('de7e5d6de80bf14ada468d01f15dd4b118a6bef5d06cadf04954fd7de7ce5910'
-            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
-
-build() {
-  cd "${srcdir}/NetworkManager-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/networkmanager \
-    --with-crypto=nss \
-    --with-distro=arch \
-    --with-dhclient=/usr/sbin/dhclient \
-    --with-dhcpcd=/sbin/dhcpcd \
-    --with-iptables=/usr/sbin/iptables \
-    --with-systemdsystemunitdir=/lib/systemd/system \
-    --disable-static \
-    --enable-more-warnings=no \
-    --disable-wimax
-
-  make
-}
-
-package() {
-  cd "${srcdir}/NetworkManager-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/"
-
-  rm -rf "${pkgdir}/var/run/"
-}
diff --git a/testing/networkmanager/disable_set_hostname.patch b/testing/networkmanager/disable_set_hostname.patch
deleted file mode 100644
index ee95dd0e1..000000000
--- a/testing/networkmanager/disable_set_hostname.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
---- NetworkManager-0.9.0.orig/src/nm-policy.c	2011-08-23 06:41:02.099686450 +0000
-+++ NetworkManager-0.9.0/src/nm-policy.c	2011-08-23 06:43:38.227791737 +0000
-@@ -302,6 +302,7 @@
- 		return;
- 	}
- 
-+#if 0
- 	/* Try automatically determined hostname from the best device's IP config */
- 	if (!best4)
- 		best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -356,6 +357,7 @@
- 		}
- 	}
- 
-+#endif
- 	/* If no automatically-configured hostname, try using the hostname from
- 	 * when NM started up.
- 	 */
diff --git a/testing/networkmanager/networkmanager.install b/testing/networkmanager/networkmanager.install
deleted file mode 100644
index de40c17ed..000000000
--- a/testing/networkmanager/networkmanager.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_upgrade() {
-  (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
-ATTENTION:
-  /etc/NetworkManager/nm-system-settings.conf has been replaced
-  by /etc/NetworkManager/NetworkManager.conf. Make sure you move
-  any custom settings to the new config file.
-MSG
-  true
-}
diff --git a/testing/nfs-utils/PKGBUILD b/testing/nfs-utils/PKGBUILD
deleted file mode 100644
index 0035c88fd..000000000
--- a/testing/nfs-utils/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 139110 2011-09-29 14:00:16Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
-# Contributor: abelstr <abel@pinklf.eu>
-# Contributor: Marco Lima <cipparello gmail com>
-
-pkgname=nfs-utils
-pkgver=1.2.5
-pkgrel=1
-pkgdesc="Support programs for Network File Systems"
-arch=('i686' 'x86_64')
-url='http://nfs.sourceforge.net'
-license=('GPL')
-backup=(etc/{exports,idmapd.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf})
-depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-	nfs-common
-	nfs-common.conf
-	nfs-server
-	nfs-server.conf
-	exports
-	idmapd.conf
-	start-statd.patch
-	nfs-utils-1.1.4-mtab-sym.patch
-	nfs-utils-1.1.4-no-exec.patch)
-install=nfs-utils.install
-md5sums=('8395ac770720b83c5c469f88306d7765'
-         'dd0d65fc6e8f422fa12520813098264b'
-         'f73f197a16b02c3e248488ec35c4cf43'
-         'e619f18354ff958ed624d05d08853d8f'
-         '2bf71def3263325643a09458635520f0'
-         'ff585faf410a62c4333a027c50b56bae'
-         'eb4f4027fab6fc1201f1ca04f5954c76'
-         'e9144277a89a620d9bc80413158a7d27'
-         '7674106eaaa4c149bccd4f05fe3604e9'
-         '4f4827dfc93008dfadd0a530ad0872b2')
-
-build() {
-  cd $srcdir/${pkgname}-${pkgver}
-  patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
-  #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch
-  # arch specific patch
-  patch -Np0 -i $srcdir/start-statd.patch
-
-  ./configure --prefix=/usr --enable-nfsv3 --enable-nfsv4 --enable-gss \
-              --without-tcp-wrappers --with-statedir=/var/lib/nfs \
-              --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount
-
-  make 
-}
-
-package() {
-  cd $srcdir/${pkgname}-${pkgver}
-  make DESTDIR=$pkgdir install
-
-  # support python2 (FS#25120)
-  sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats}
-
-  # NFS & NFSv4 init scripts
-  install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common
-  install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server
-  # Configuration
-  install -D -m 644 ../exports "$pkgdir/"etc/exports
-  install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf
-  install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf
-  install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf
-  # directories
-  mkdir "$pkgdir/"etc/exports.d
-  mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs
-  mkdir "$pkgdir/"var/lib/nfs/v4recovery
-}
diff --git a/testing/nfs-utils/exports b/testing/nfs-utils/exports
deleted file mode 100644
index 8f4aac598..000000000
--- a/testing/nfs-utils/exports
+++ /dev/null
@@ -1,15 +0,0 @@
-# /etc/exports
-#
-# List of directories exported to NFS clients.  See exports(5).
-# Use exportfs -arv to reread.
-#
-# Example for NFSv2 and NFSv3:
-#  /srv/home       hostname1(rw,sync) hostname2(ro,sync)
-#
-# Example for NFSv4:
-#  /srv/nfs4	   hostname1(rw,sync,fsid=0)
-#  /srv/nfs4/home   hostname1(rw,sync,nohide)
-# Using Kerberos and integrity checking:
-#  /srv/nfs4        gss/krb5i(rw,sync,fsid=0,crossmnt)
-#  /srv/nfs4/home   gss/krb5i(rw,sync,nohide)
-#
diff --git a/testing/nfs-utils/idmapd.conf b/testing/nfs-utils/idmapd.conf
deleted file mode 100644
index b1b23afe9..000000000
--- a/testing/nfs-utils/idmapd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[General]
-
-Verbosity = 0
-Pipefs-Directory = /var/lib/nfs/rpc_pipefs
-Domain = localdomain
-
-[Mapping]
-
-Nobody-User = nobody
-Nobody-Group = nobody
-
-[Translation]
-
-Method = nsswitch
diff --git a/testing/nfs-utils/kernel-3.0-segfault.patch b/testing/nfs-utils/kernel-3.0-segfault.patch
deleted file mode 100644
index 3dba94a05..000000000
--- a/testing/nfs-utils/kernel-3.0-segfault.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-mount.nfs segfaults if kernel version number does not contain
-at least 3 components delimited with a dot.
-
-Avoid this by matching up to three unsigned integers inialised
-to zero, separated by dots.
-
-A version that does not start with an integer is probably a future
-version where the versioning evolved to another scheme.
-Return UINT_MAX which is guaranteed to be higher than existing
-versions. This would also make it possible to easily identify
-versions that do not start with an integer.
-
-Signed-off-by: Luk Claes <luk@...>
----
- utils/mount/version.h |   16 +++++++++-------
- 1 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/utils/mount/version.h b/utils/mount/version.h
-index af61a6f..531cf68 100644
---- a/utils/mount/version.h
-+++ b/utils/mount/version.h
-@@ -23,8 +23,8 @@
- #ifndef _NFS_UTILS_MOUNT_VERSION_H
- #define _NFS_UTILS_MOUNT_VERSION_H
-
--#include <stdlib.h>
--#include <string.h>
-+#include <stdio.h>
-+#include <limits.h>
-
- #include <sys/utsname.h>
-
-@@ -37,14 +37,16 @@ static inline unsigned int MAKE_VERSION(unsigned int p, unsigned int q,
- static inline unsigned int linux_version_code(void)
- {
- 	struct utsname my_utsname;
--	unsigned int p, q, r;
-+	unsigned int p, q = 0, r = 0;
-
-+	/* UINT_MAX as backward compatibility code should not be run */
- 	if (uname(&my_utsname))
--		return 0;
-+		return UINT_MAX;
-
--	p = (unsigned int)atoi(strtok(my_utsname.release, "."));
--	q = (unsigned int)atoi(strtok(NULL, "."));
--	r = (unsigned int)atoi(strtok(NULL, "."));
-+	/* UINT_MAX as future versions might not start with an integer */
-+	if (sscanf(my_utsname.release, "%u.%u.%u", &p, &q, &r) < 1)
-+		return UINT_MAX;
-+	
- 	return MAKE_VERSION(p, q, r);
- }
diff --git a/testing/nfs-utils/nfs-common b/testing/nfs-utils/nfs-common
deleted file mode 100644
index 7b16b4b3c..000000000
--- a/testing/nfs-utils/nfs-common
+++ /dev/null
@@ -1,315 +0,0 @@
-#!/bin/bash
-
-daemon_name=nfs-common
-
-NEED_STATD=
-STATD_OPTS=
-NEED_IDMAPD=
-IDMAPD_OPTS=
-NEED_GSSD=
-GSSD_OPTS=
-PIPEFS_MOUNTPOINT=
-PIPEFS_MOUNTOPTS=
-
-# rpc.statd daemon & binary location
-STATD_DAEMON_NAME=rpc.statd
-STATD="/usr/sbin/rpc.statd"
-
-# rpc.idmapd daemon & binary location
-IDMAPD_DAEMON_NAME=rpc.idmapd
-IDMAPD="/usr/sbin/rpc.idmapd"
-
-# rpc.gssd daemon & binary location
-GSSD_DAEMON_NAME=rpc.gssd
-GSSD="/usr/sbin/rpc.gssd"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-# Default mountpoint and options for rpc_pipefs filesystem
-[ -z "$PIPEFS_MOUNTPOINT" ] && PIPEFS_MOUNTPOINT="/var/lib/nfs/rpc_pipefs"
-[ -z "$PIPEFS_MOUNTOPTS" ] && PIPEFS_MOUNTOPTS="defaults"
-
-# Parse the fstab file, and determine whether we need idmapd and gssd. (The
-# /etc/conf.d/nfs-common settings, if any, will override our autodetection.) 
-AUTO_NEED_IDMAPD=no
-AUTO_NEED_GSSD=no
-
-if [ -f /etc/fstab ]; then
-  exec 9<&0 </etc/fstab
-  
-  while read DEV MTPT FSTYPE OPTS REST; do
-    if [ "$FSTYPE" = "nfs4" ]; then
-      AUTO_NEED_IDMAPD=yes
-    fi
-    case "$OPTS" in
-      sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
-	AUTO_NEED_GSSD=yes
-      ;;
-    esac
-  done
-
-  exec 0<&9 9<&-
-fi
-
-# We also need idmapd if we run an NFSv4 server. It's fairly difficult
-# to autodetect whether there are NFSv4 exports or not, and idmapd is not a
-# particularily heavy daemon, so we auto-enable it if we find an /etc/exports
-# file. This does not mean that there are NFSv4 or other mounts active (or
-# even that nfs-kernel-server is installed), but it matches what the "start"
-# condition in nfs-kernel-server's init script does, which has a value in
-# itself.
-if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then
-  AUTO_NEED_IDMAPD=yes
-fi
-
-case "$NEED_STATD" in
-  yes|no)
-    ;;
-  *)
-    NEED_STATD=yes
-    ;;
-esac
-
-case "$NEED_IDMAPD" in
-  yes|no)	
-    ;;
-  *)
-    NEED_IDMAPD=$AUTO_NEED_IDMAPD
-    ;;
-esac
-
-case "$NEED_GSSD" in
-  yes|no)	
-    ;;
-  *)
-    NEED_GSSD=$AUTO_NEED_GSSD
-    ;;
-esac
-
-do_modprobe() {
-    if [ -x /sbin/modprobe -a -f /proc/modules ]; then
-      modprobe -q "$1" || true
-    fi
-}
-
-do_mount() {
-    if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then
-      return 1
-    fi
-    
-    if grep -vw "$1" /proc/mounts &> /dev/null ; then
-      if ! mountpoint -q "$2" ; then
-	mount -t "$1" "$1" "$2" -o "$3"
-	return
-      fi
-    fi
-    return 0
-}
-
-do_umount() {
-    if mountpoint -q "$1" ; then
-      umount "$1"
-    fi
-    return 0
-}
-
-get_pid() {
-	pidof -o %PPID "$1"
-}
-
-case "$1" in
-  start)
-    ck_daemon rpcbind && { echo -n "Start rpcbind first." >&2; stat_die; }
-    rc=0
-    if [ "$NEED_STATD" = yes ]; then
-      stat_busy "Starting $STATD_DAEMON_NAME daemon"
-      PID=$(get_pid $STATD)
-      if [ -z "$PID" ]; then
-	[ -f /var/run/$STATD_DAEMON_NAME.pid ] && rm -f /var/run/$STATD_DAEMON_NAME.pid
-	# RUN
-	$STATD $STATD_OPTS
-	#
-	rc=$(($rc+$?))
-	if [ $rc -gt 0 ]; then
-	  stat_fail
-	  exit $rc
-	else
-	  echo $(get_pid $STATD) > /var/run/$STATD_DAEMON_NAME.pid
-	  stat_done
-	fi
-      else
-	stat_fail
-	exit 1
-      fi
-      # Run sm-notify
-      /usr/sbin/sm-notify $SMNOTIFY_OPTS
-    fi
-
-    if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then
-      stat_busy "Mounting pipefs filesystem"
-      do_modprobe sunrpc
-      do_modprobe nfs
-      do_modprobe nfsd
-      do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS" 
-      rc=$(($rc+$?))
-      if [ $rc -gt 0 ]; then
-	stat_fail
-	exit $rc
-      else
-        stat_done
-      fi
-
-      if [ "$NEED_IDMAPD" = yes ]; then
-	stat_busy "Starting $IDMAPD_DAEMON_NAME daemon"
-	PID=$(get_pid $IDMAPD)
-	if [ -z "$PID" ]; then
-	  [ -f /var/run/$IDMAPD_DAEMON_NAME.pid ] && rm -f /var/run/$IDMAPD_DAEMON_NAME.pid
-	  # RUN
-	  $IDMAPD $IDMAPD_OPTS
-	  #
-	  rc=$(($rc+$?))
-	  if [ $rc -gt 0 ]; then
-	    stat_fail
-	    exit $rc
-	  else
-	    echo $(get_pid $IDMAPD) > /var/run/$IDMAPD_DAEMON_NAME.pid
-	    stat_done
-	  fi
-	else
-	  stat_fail
-	  exit 1
-        fi
-      fi
-
-      if [ "$NEED_GSSD" = yes ]; then
-	do_modprobe rpcsec_gss_krb5
-	stat_busy "Starting $GSSD_DAEMON_NAME daemon"
-	PID=$(get_pid $GSSD)
-	if [ -z "$PID" ]; then
-	  [ -f /var/run/$GSSD_DAEMON_NAME.pid ] && rm -f /var/run/$GSSD_DAEMON_NAME.pid
-	  # RUN
-	  $GSSD $GSSD_OPTS
-	  #
-	  rc=$(($rc+$?))
-	  if [ $rc -gt 0 ]; then
-	    stat_fail
-	    exit $rc
-	  else
-	    echo $(get_pid $GSSD) > /var/run/$GSSD_DAEMON_NAME.pid
-	    stat_done
-	  fi
-	else
-	  stat_fail
-	  exit 1
-        fi
-      fi
-    fi
-
-    add_daemon $daemon_name
-    ;;
-
-  stop)
-    rc=0
-    if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then
-
-      if [ "$NEED_GSSD" = yes ]; then
-	stat_busy "Stopping $GSSD_DAEMON_NAME daemon"
-	PID=$(get_pid $GSSD)
-	# KILL
-	[ ! -z "$PID" ] && kill $PID &> /dev/null
-	#
-	rc=$(($rc+$?))
-	if [ $rc -gt 0 ]; then
-	  stat_fail
-	  exit $rc
-	else
-	  rm -f /var/run/$GSSD_DAEMON_NAME.pid &> /dev/null
-	  stat_done
-	fi
-      fi
-
-      if [ "$NEED_IDMAPD" = yes ]; then
-	stat_busy "Stopping $IDMAPD_DAEMON_NAME daemon"
-	PID=$(get_pid $IDMAPD)
-	# KILL
-	[ ! -z "$PID" ] && kill $PID &> /dev/null
-	#
-	rc=$(($rc+$?))
-	if [ $rc -gt 0 ]; then
-	  stat_fail
-	  exit $rc
-	else
-	  rm -f /var/run/$IDMAPD_DAEMON_NAME.pid &> /dev/null
-	  stat_done
-	fi
-      fi
-      do_umount "$PIPEFS_MOUNTPOINT" 2>/dev/null || true
-    fi
-
-    if [ "$NEED_STATD" = yes ]; then
-      stat_busy "Stopping $STATD_DAEMON_NAME daemon"
-      PID=$(get_pid $STATD)
-      # KILL
-      [ ! -z "$PID" ] && kill $PID &> /dev/null
-      #
-      rc=$(($rc+$?))
-      if [ $rc -gt 0 ]; then
-	stat_fail
-	exit $rc
-      else
-	rm -f /var/run/$STATD_DAEMON_NAME.pid &> /dev/null
-	stat_done
-      fi
-    fi
-
-    rm_daemon $daemon_name
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-
-    if [ "$NEED_STATD" = yes ]; then
-      stat_busy "Daemon $STATD_DAEMON_NAME running"
-      PID=$(get_pid $STATD)
-      if [ -z "$PID" ]; then
-	stat_fail
-      else
-	stat_done
-      fi
-    fi
-
-    if [ "$NEED_GSSD" = yes ]; then
-      stat_busy "Daemon $GSSD_DAEMON_NAME running"
-      PID=$(get_pid $GSSD)
-      if [ -z "$PID" ]; then
-	stat_fail
-      else
-	stat_done
-      fi
-    fi
-      
-    if [ "$NEED_IDMAPD" = yes ]; then
-      stat_busy "Daemon $IDMAPD_DAEMON_NAME running"
-      PID=$(get_pid $IDMAPD)
-      if [ -z "$PID" ]; then
-	stat_fail
-      else
-	stat_done
-      fi
-    fi
-    echo
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|status|restart}"  
-esac
-exit 0
-	    
diff --git a/testing/nfs-utils/nfs-common.conf b/testing/nfs-utils/nfs-common.conf
deleted file mode 100644
index 12466b3e5..000000000
--- a/testing/nfs-utils/nfs-common.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# Parameters to be passed to nfs-common (nfs clients & server) init script.
-#
-
-# If you do not set values for the NEED_ options, they will be attempted
-# autodetected; this should be sufficient for most people. Valid alternatives
-# for the NEED_ options are "yes" and "no".
-
-# Do you want to start the statd daemon? It is not needed for NFSv4.
-NEED_STATD=""
-
-# Options to pass to rpc.statd.
-# See rpc.statd(8) for more details.
-# N.B. statd normally runs on both client and server, and run-time
-# options should be specified accordingly.
-# STATD_OPTS="-p 32765 -o 32766"
-STATD_OPTS=""
-
-# Options to pass to sm-notify
-# e.g. SMNOTIFY_OPTS="-p 32764"
-SMNOTIFY_OPTS=""
-
-# Do you want to start the idmapd daemon? It is only needed for NFSv4.
-NEED_IDMAPD=""
-
-# Options to pass to rpc.idmapd.
-# See rpc.idmapd(8) for more details.
-IDMAPD_OPTS=""
-
-# Do you want to start the gssd daemon? It is required for Kerberos mounts.
-NEED_GSSD=""
-
-# Options to pass to rpc.gssd.
-# See rpc.gssd(8) for more details.
-GSSD_OPTS=""
-
-# Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs".
-PIPEFS_MOUNTPOINT=""
-
-# Options used to mount rpc_pipefs filesystem; the default is "defaults".
-PIPEFS_MOUNTOPTS=""
diff --git a/testing/nfs-utils/nfs-server b/testing/nfs-utils/nfs-server
deleted file mode 100644
index 6aa609d8c..000000000
--- a/testing/nfs-utils/nfs-server
+++ /dev/null
@@ -1,299 +0,0 @@
-#!/bin/bash
-
-daemon_name=nfs-server
-
-NFSD_COUNT=
-NFSD_OPTS=
-NEED_SVCGSSD=
-SVCGSSD_OPTS=
-MOUNTD_OPTS=
-PROCNFSD_MOUNTPOINT=
-PROCNFSD_MOUNTOPTS=
-
-# rpc.nfsd daemon & binary location
-NFSD_PROCESS_NAME=nfsd
-NFSD_DAEMON_NAME=rpc.nfsd
-NFSD="/usr/sbin/rpc.nfsd"
-
-# rpc.svcgssd daemon & binary location
-SVCGSSD_DAEMON_NAME=rpc.svcgssd
-SVCGSSD="/usr/sbin/rpc.svcgssd"
-
-# rpc.idmapd daemon & binary location
-IDMAPD_DAEMON_NAME=rpc.idmapd
-IDMAPD="/usr/sbin/rpc.idmapd"
-
-# rpc.mountd daemon & binary location
-MOUNTD_DAEMON_NAME=rpc.mountd
-MOUNTD="/usr/sbin/rpc.mountd"
-
-# exortfs binary location
-EXPORTFS="/usr/sbin/exportfs"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-# Default number of nfsd servers
-[ -z "$NFSD_COUNT" ] && NFSD_COUNT=8
-
-# Default mountpoint and options for nfsd filesystem
-[ -z "$PROCNFSD_MOUNTPOINT" ] && PROCNFSD_MOUNTPOINT="/proc/fs/nfsd"
-[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid"
-
-case "$NEED_SVCGSSD" in
-  yes|no)
-    ;;
-  *)
-    NEED_SVCGSSD=no
-    ;;
-esac
-
-do_modprobe() {
-    if [ -x /sbin/modprobe -a -f /proc/modules ]; then
-      modprobe -q "$1" || true
-    fi
-}
-
-do_mount() {
-    if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then
-      return 1
-    fi
-    
-    if grep -vw "$1" /proc/mounts &> /dev/null ; then
-      if ! mountpoint -q "$2" ; then
-	mount -t "$1" "$1" "$2" -o "$3"
-	return
-      fi
-    fi
-    return 0
-}
-
-do_umount() {
-    if mountpoint -q "$1" ; then
-      umount "$1"
-    fi
-    return 0
-}
-
-get_pid() {
-	pidof -o %PPID "$1"
-}
-
-case "$1" in
-  start)
-    ck_daemon nfs-common && { echo -n "Start nfs-common first." >&2; stat_die; }
-    rc=0
-    stat_busy "Mounting nfsd filesystem"
-    do_modprobe nfsd
-    do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS"
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      stat_done
-    fi
-
-    stat_busy "Exporting all directories"
-    $EXPORTFS -r
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      stat_done
-    fi
-
-    stat_busy "Starting $NFSD_DAEMON_NAME daemon"
-    PID=$(get_pid $NFSD_PROCESS_NAME)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$NFSD_DAEMON_NAME.pid ] && rm -f /var/run/$NFSD_DAEMON_NAME.pid
-      # RUN
-      $NFSD $NFSD_OPTS $NFSD_COUNT
-      #
-      rc=$(($rc+$?))
-      if [ $rc -gt 0 ]; then
-	stat_fail
-	exit $rc
-      else
-	echo $(get_pid $NFSD_PROCESS_NAME) > /var/run/$NFSD_DAEMON_NAME.pid
-	stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-
-    if [ "$NEED_SVCGSSD" = yes ]; then
-      do_modprobe rpcsec_gss_krb5
-      stat_busy "Starting $SVCGSSD_DAEMON_NAME daemon"
-      PID=$(get_pid $SVCGSSD)
-      if [ -z "$PID" ]; then
-	[ -f /var/run/$SVCGSSD_DAEMON_NAME.pid ] && rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid
-	# RUN
-	$SVCGSSD $SVCGSSD_OPTS
-	#
-	rc=$(($rc+$?))
-	if [ $rc -gt 0 ]; then
-	  stat_fail
-	  exit $rc
-	else
-	  echo $(get_pid $SVCGSSD) > /var/run/$SVCGSSD_DAEMON_NAME.pid
-	  stat_done
-	fi
-      else
-	stat_fail
-	exit 1
-      fi
-    fi
-
-    PID=$(get_pid $IDMAPD)
-    [ ! -z "$PID" ] && kill -SIGHUP $IDMAPD_DAEMON_NAME &> /dev/null
-
-    stat_busy "Starting $MOUNTD_DAEMON_NAME daemon"
-    PID=$(get_pid $MOUNTD)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$MOUNTD_DAEMON_NAME.pid ] && rm -f /var/run/$MOUNTD_DAEMON_NAME.pid
-      # RUN
-      $MOUNTD $MOUNTD_OPTS
-      #
-      rc=$(($rc+$?))
-      if [ $rc -gt 0 ]; then
-	stat_fail
-	exit $rc
-      else
-	echo $(get_pid $MOUNTD) > /var/run/$MOUNTD_DAEMON_NAME.pid
-	stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-
-    add_daemon $daemon_name
-    ;;
-
-  stop)
-    rc=0
-    stat_busy "Stopping $MOUNTD_DAEMON_NAME daemon"
-    PID=$(get_pid $MOUNTD)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      rm -f /var/run/$MOUNTD_DAEMON_NAME.pid &> /dev/null
-      stat_done
-    fi
-
-    if [ "$NEED_SVCGSSD" = yes ]; then
-      stat_busy "Stopping $SVCGSSD_DAEMON_NAME daemon"
-      PID=$(get_pid $SVCGSSD)
-      # KILL
-      [ ! -z "$PID" ] && kill $PID &> /dev/null
-      #
-      rc=$(($rc+$?))
-      if [ $rc -gt 0 ]; then
-	stat_fail
-	exit $rc
-      else
-	rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid &> /dev/null
-	stat_done
-      fi
-    fi
-
-    stat_busy "Stopping $NFSD_DAEMON_NAME daemon"
-    PID=$(get_pid $NFSD_PROCESS_NAME)
-    # KILL (SIGINT)
-    [ ! -z "$PID" ] && kill -2 $PID &> /dev/null
-    #
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      sleep 1
-      PID=$(get_pid $NFSD_PROCESS_NAME)
-      # KILL (KILL) - just to be sure
-      [ ! -z "$PID" ] && kill -9 $PID &> /dev/null
-      #
-      rm -f /var/run/$NFSD_DAEMON_NAME.pid &> /dev/null
-      stat_done
-    fi
-
-    stat_busy "Unexporting all directories"
-    $EXPORTFS -au
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      stat_done
-    fi
-
-    # flush everything out of the kernels export table
-    if mountpoint -q "$PROCNFSD_MOUNTPOINT" ; then
-      $EXPORTFS -f
-    fi
-    do_umount "$PROCNFSD_MOUNTPOINT" 2>/dev/null || true
-    rm_daemon $daemon_name
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-
-    stat_busy "Daemon $NFSD_DAEMON_NAME running"
-    PID=$(get_pid $NFSD_PROCESS_NAME)
-    if [ -z "$PID" ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-
-    stat_busy "Daemon $MOUNTD_DAEMON_NAME running"
-    PID=$(get_pid $MOUNTD)
-    if [ -z "$PID" ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-
-    if [ "$NEED_SVCGSSD" = yes ]; then
-      stat_busy "Daemon $SVCGSSD_DAEMON_NAME running"
-      PID=$(get_pid $SVCGSSD)
-      if [ -z "$PID" ]; then
-	stat_fail
-      else
-	stat_done
-      fi
-    fi
-    echo
-    ;;
-
-  reload)
-    rc=0
-    stat_busy "Re-exporting all directories"
-    $EXPORTFS -r
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|status|reload|restart}"  
-esac
-exit 0
diff --git a/testing/nfs-utils/nfs-server.conf b/testing/nfs-utils/nfs-server.conf
deleted file mode 100644
index 4054d6b88..000000000
--- a/testing/nfs-utils/nfs-server.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# Parameters to be passed to nfs-server init script.
-#
-
-# Options to pass to rpc.nfsd.
-# See rpc.nfsd(8) for more details.
-NFSD_OPTS=""
-
-# Number of servers to start up; the default is 8 servers.
-NFSD_COUNT=""
-
-# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd".
-PROCNFSD_MOUNTPOINT=""
-
-# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid".
-PROCNFSD_MOUNTOPTS=""
-
-# Options for rpc.mountd.
-# If you have a port-based firewall, you might want to set up
-# a fixed port here using the --port option.
-# See rpc.mountd(8) for more details.
-MOUNTD_OPTS="--no-nfs-version 2"
-
-# Do you want to start the svcgssd daemon? It is only required for Kerberos
-# exports. Valid alternatives are "yes" and "no"; the default is "no".
-NEED_SVCGSSD=""
-
-# Options to pass to rpc.svcgssd.
-# See rpc.svcgssd(8) for more details.
-SVCGSSD_OPTS=""
diff --git a/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch b/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch
deleted file mode 100644
index 4a5a138e7..000000000
--- a/testing/nfs-utils/nfs-utils-1.1.2-kerberos-ac.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -NaurwB nfs-utils-1.1.2.orig/aclocal/kerberos5.m4 nfs-utils-1.1.2/aclocal/kerberos5.m4
---- nfs-utils-1.1.2.orig/aclocal/kerberos5.m4	2008-03-14 16:46:29.000000000 +0100
-+++ nfs-utils-1.1.2/aclocal/kerberos5.m4	2008-06-12 17:13:51.000000000 +0200
-@@ -1,112 +1,48 @@
--dnl Checks for Kerberos
--dnl NOTE: while we intend to do generic gss-api, currently we
--dnl have a requirement to get an initial Kerberos machine
--dnl credential.  Thus, the requirement for Kerberos.
--dnl The Kerberos gssapi library will be dynamically loaded?
- AC_DEFUN([AC_KERBEROS_V5],[
-+  K5CONFIG="krb5-config"
-   AC_MSG_CHECKING(for Kerberos v5)
--  AC_ARG_WITH(krb5,
--  [AC_HELP_STRING([--with-krb5=DIR], [use Kerberos v5 installation in DIR])],
-+  AC_ARG_WITH(krb5-config,
-+  [AC_HELP_STRING([--with-krb5-config=PATH], [Full Path to krb5-config.])],
-   [ case "$withval" in
-     yes|no)
--       krb5_with=""
-+       K5CONFIG="krb5-config"
-        ;;
-     *)
--       krb5_with="$withval"
-+       K5CONFIG="$withval"
-        ;;
-     esac ]
-   )
- 
--  for dir in $krb5_with /usr /usr/kerberos /usr/local /usr/local/krb5 \
--  	     /usr/krb5 /usr/heimdal /usr/local/heimdal /usr/athena ; do
--    dnl This ugly hack brought on by the split installation of
--    dnl MIT Kerberos on Fedora Core 1
--    K5CONFIG=""
--    if test -f $dir/bin/krb5-config; then
--      K5CONFIG=$dir/bin/krb5-config
--    elif test -f "/usr/kerberos/bin/krb5-config"; then
--      K5CONFIG="/usr/kerberos/bin/krb5-config"
--    elif test -f "/usr/lib/mit/bin/krb5-config"; then
--      K5CONFIG="/usr/lib/mit/bin/krb5-config"
--    fi
-     if test "$K5CONFIG" != ""; then
-       KRBCFLAGS=`$K5CONFIG --cflags`
-       KRBLIBS=`$K5CONFIG --libs gssapi`
--      K5VERS=`$K5CONFIG --version | head -n 1 | awk '{split($(4),v,"."); if (v@<:@"3"@:>@ == "") v@<:@"3"@:>@ = "0"; print v@<:@"1"@:>@v@<:@"2"@:>@v@<:@"3"@:>@ }'`
--      AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
--      if test -f $dir/include/gssapi/gssapi_krb5.h -a \
--                \( -f $dir/lib/libgssapi_krb5.a -o \
--                   -f $dir/lib64/libgssapi_krb5.a -o \
--                   -f $dir/lib64/libgssapi_krb5.so -o \
--                   -f $dir/lib/libgssapi_krb5.so \) ; then
-+    if $K5CONFIG --version | grep -q -e heimdal; then
-+      K5VERS=`$K5CONFIG --version | head -n 1 | cut -f2 -d ' ' | tr -d '.'`
-+      AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
-+      gssapi_lib=gssapi
-+      KRBIMPL="heimdal"
-+    elif $K5CONFIG --version | grep -q -e mit; then
-+      K5VERS=`$K5CONFIG --version | head -n 1 | cut -f4 -d ' ' | tr -d '.'`
-          AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
--         KRBDIR="$dir"
--  dnl If we are using MIT K5 1.3.1 and before, we *MUST* use the
--  dnl private function (gss_krb5_ccache_name) to get correct
--  dnl behavior of changing the ccache used by gssapi.
--  dnl Starting in 1.3.2, we *DO NOT* want to use
--  dnl gss_krb5_ccache_name, instead we want to set KRB5CCNAME
--  dnl to get gssapi to use a different ccache
-          if test $K5VERS -le 131; then
-            AC_DEFINE(USE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the private function, gss_krb5_cache_name, must be used to tell the Kerberos library which credentials cache to use. Otherwise, this is done by setting the KRB5CCNAME environment variable])
-          fi
-          gssapi_lib=gssapi_krb5
--         break
--      dnl The following ugly hack brought on by the split installation
--      dnl of Heimdal Kerberos on SuSe
--      elif test \( -f $dir/include/heim_err.h -o\
--      		 -f $dir/include/heimdal/heim_err.h \) -a \
--                -f $dir/lib/libroken.a; then
--         AC_DEFINE(HAVE_HEIMDAL, 1, [Define this if you have Heimdal Kerberos libraries])
--         KRBDIR="$dir"
--         gssapi_lib=gssapi
--        break
--      fi
--    fi
--  done
--  dnl We didn't find a usable Kerberos environment
--  if test "x$KRBDIR" = "x"; then
--    if test "x$krb5_with" = "x"; then
--      AC_MSG_ERROR(Kerberos v5 with GSS support not found: consider --disable-gss or --with-krb5=)
-+      KRBIMPL="mit-krb5"
-     else
--      AC_MSG_ERROR(Kerberos v5 with GSS support not found at $krb5_with)
--    fi
-+      AC_MSG_ERROR(Unknown Kerberos 5 Implementation. Is neither heimdal or mit-krb5.)
-+      KRBIMPL="unknown"
-   fi
--  AC_MSG_RESULT($KRBDIR)
--
--  dnl Check if -rpath=$(KRBDIR)/lib is needed
--  echo "The current KRBDIR is $KRBDIR"
--  if test "$KRBDIR/lib" = "/lib" -o "$KRBDIR/lib" = "/usr/lib" \
--       -o "$KRBDIR/lib" = "//lib" -o "$KRBDIR/lib" = "/usr//lib" ; then
--    KRBLDFLAGS="";
--  elif /sbin/ldconfig -p | grep > /dev/null "=> $KRBDIR/lib/"; then
--    KRBLDFLAGS="";
--  else
--    KRBLDFLAGS="-Wl,-rpath=$KRBDIR/lib"
-+    AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
-   fi
-+  AC_MSG_RESULT($KRBIMPL)
- 
--  dnl Now check for functions within gssapi library
--  AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context,
--    AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS)
--  AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes,
--    AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS)
--  AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name,
--    AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS)
--
--  dnl Check for newer error message facility
--  AC_CHECK_LIB($gssapi_lib, krb5_get_error_message,
--    AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS)
-+  AC_CHECK_LIB($gssapi_lib, gss_krb5_export_lucid_sec_context, AC_DEFINE(HAVE_LUCID_CONTEXT_SUPPORT, 1, [Define this if the Kerberos GSS library supports gss_krb5_export_lucid_sec_context]), ,$KRBLIBS)
-+  AC_CHECK_LIB($gssapi_lib, gss_krb5_set_allowable_enctypes, AC_DEFINE(HAVE_SET_ALLOWABLE_ENCTYPES, 1, [Define this if the Kerberos GSS library supports gss_krb5_set_allowable_enctypes]), ,$KRBLIBS)
-+  AC_CHECK_LIB($gssapi_lib, gss_krb5_ccache_name, AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME, 1, [Define this if the Kerberos GSS library supports gss_krb5_ccache_name]), ,$KRBLIBS)
-+  AC_CHECK_LIB($gssapi_lib, krb5_get_error_message, AC_DEFINE(HAVE_KRB5_GET_ERROR_MESSAGE, 1, [Define this if the function krb5_get_error_message is available]), ,$KRBLIBS)
-+  AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless, AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS)
- 
--  dnl Check for function to specify addressless tickets
--  AC_CHECK_LIB($gssapi_lib, krb5_get_init_creds_opt_set_addressless,
--    AC_DEFINE(HAVE_KRB5_GET_INIT_CREDS_OPT_SET_ADDRESSLESS, 1, [Define this if the function krb5_get_init_creds_opt_set_addressless is available]), ,$KRBLIBS)
--
--  dnl If they specified a directory and it didn't work, give them a warning
--  if test "x$krb5_with" != "x" -a "$krb5_with" != "$KRBDIR"; then
--    AC_MSG_WARN(Using $KRBDIR instead of requested value of $krb5_with for Kerberos!)
--  fi
--
--  AC_SUBST([KRBDIR])
-   AC_SUBST([KRBLIBS])
-   AC_SUBST([KRBCFLAGS])
-   AC_SUBST([KRBLDFLAGS])
diff --git a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
deleted file mode 100644
index c9e60afc7..000000000
--- a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-ripped from Debian
-
---- nfs-utils-1.1.4/utils/mount/fstab.c
-+++ nfs-utils-1.1.4/utils/mount/fstab.c
-@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
- 	return var_mtab_does_not_exist;
- }
- 
--static int
-+int
- mtab_is_a_symlink(void) {
-         get_mtab_info();
-         return var_mtab_is_a_symlink;
---- nfs-utils-1.1.4/utils/mount/fstab.h
-+++ nfs-utils-1.1.4/utils/mount/fstab.h
-@@ -7,6 +7,7 @@
- #define _PATH_FSTAB "/etc/fstab"
- #endif
- 
-+int mtab_is_a_symlink(void);
- int mtab_is_writable(void);
- int mtab_does_not_exist(void);
- void reset_mtab_info(void);
---- nfs-utils-1.1.4/utils/mount/mount.c
-+++ nfs-utils-1.1.4/utils/mount/mount.c
-@@ -230,6 +230,13 @@ create_mtab (void) {
- 	int flags;
- 	mntFILE *mfp;
- 
-+	/* Avoid writing if the mtab is a symlink to /proc/mounts, since
-+	   that would create a file /proc/mounts in case the proc filesystem
-+	   is not mounted, and the fchmod below would also fail. */
-+	if (mtab_is_a_symlink()) {
-+		return EX_SUCCESS;
-+	}
-+
- 	lock_mtab();
- 
- 	mfp = nfs_setmntent (MOUNTED, "a+");
diff --git a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch
deleted file mode 100644
index ea50a21d8..000000000
--- a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-ripped from Debian
-
---- nfs-utils-1.1.2/utils/mount/mount.c
-+++ nfs-utils-1.1.2/utils/mount/mount.c
-@@ -381,10 +381,6 @@
- 		mount_error(NULL, mount_point, ENOTDIR);
- 		return 1;
- 	}
--	if (access(mount_point, X_OK) < 0) {
--		mount_error(NULL, mount_point, errno);
--		return 1;
--	}
- 
- 	return 0;
- }
diff --git a/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch b/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch
deleted file mode 100644
index 7f6c7a751..000000000
--- a/testing/nfs-utils/nfs-utils-1.1.6-heimdal_functions.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naur nfs-utils-1.1.6.orig/utils/gssd/krb5_util.c nfs-utils-1.1.6/utils/gssd/krb5_util.c
---- utils/gssd/krb5_util.c      2009-04-20 19:32:50.000000000 +0200
-+++ utils/gssd/krb5_util.c      2009-04-20 20:57:31.000000000 +0200
-@@ -940,9 +940,37 @@
- {
- 	krb5_error_code ret;
- 	krb5_creds creds;
--	krb5_cc_cursor cur;
- 	int found = 0;
- 
-+#ifdef HAVE_HEIMDAL
-+	krb5_creds pattern;
-+	krb5_realm *client_realm;
-+
-+	krb5_cc_clear_mcred(&pattern);
-+
-+	client_realm = krb5_princ_realm (context, principal);
-+
-+	ret = krb5_make_principal (context, &pattern.server,
-+				   *client_realm, KRB5_TGS_NAME, *client_realm,
-+				   NULL);
-+	if (ret)
-+	  krb5_err (context, 1, ret, "krb5_make_principal");
-+	pattern.client = principal;
-+
-+	ret = krb5_cc_retrieve_cred (context, ccache, 0, &pattern, &creds);
-+	krb5_free_principal (context, pattern.server);
-+	if (ret) {
-+	  if (ret == KRB5_CC_END)
-+            return 1;
-+	  krb5_err (context, 1, ret, "krb5_cc_retrieve_cred");
-+	}
-+
-+	found = creds.times.endtime > time(NULL);
-+
-+	krb5_free_cred_contents (context, &creds);
-+#else
-+	krb5_cc_cursor cur;
-+
- 	ret = krb5_cc_start_seq_get(context, ccache, &cur);
- 	if (ret) 
- 		return 0;
-@@ -962,6 +990,7 @@
- 		krb5_free_cred_contents(context, &creds);
- 	}
- 	krb5_cc_end_seq_get(context, ccache, &cur);
-+#endif
- 
- 	return found;
- }
-@@ -1008,6 +1037,9 @@
- 	}
- 	krb5_free_principal(context, principal);
- err_princ:
-+#ifdef HAVE_HEIMDAL
-+#define KRB5_TC_OPENCLOSE              0x00000001
-+#endif
- 	krb5_cc_set_flags(context, ccache,  KRB5_TC_OPENCLOSE);
- 	krb5_cc_close(context, ccache);
- err_cache:
-@@ -1262,7 +1294,7 @@
- 	if (context != NULL) {
- 		origmsg = krb5_get_error_message(context, code);
- 		msg = strdup(origmsg);
--		krb5_free_error_message(context, origmsg);
-+		krb5_free_error_string(context, origmsg);
- 	}
- #endif
- 	if (msg != NULL)
diff --git a/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch b/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch
deleted file mode 100644
index 917136a8c..000000000
--- a/testing/nfs-utils/nfs-utils-1.1.6-no_libgssapi.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: nfs-utils-1.1.6/utils/gssd/context_lucid.c
-===================================================================
---- nfs-utils-1.1.6.orig/utils/gssd/context_lucid.c
-+++ nfs-utils-1.1.6/utils/gssd/context_lucid.c
-@@ -51,8 +51,10 @@
- #include "context.h"
- 
- #ifndef OM_uint64
-+#ifndef GSSAPI_GSSAPI_H_
- typedef uint64_t OM_uint64;
- #endif
-+#endif
- 
- static int
- write_lucid_keyblock(char **p, char *end, gss_krb5_lucid_key_t *key)
-@@ -177,10 +179,10 @@
- 	int retcode = 0;
- 
- 	printerr(2, "DEBUG: serialize_krb5_ctx: lucid version!\n");
--	maj_stat = gss_export_lucid_sec_context(&min_stat, &ctx,
-+	maj_stat = gss_krb5_export_lucid_sec_context(&min_stat, &ctx,
- 						1, &return_ctx);
- 	if (maj_stat != GSS_S_COMPLETE) {
--		pgsserr("gss_export_lucid_sec_context",
-+		pgsserr("gss_krb5_export_lucid_sec_context",
- 			maj_stat, min_stat, &krb5oid);
- 		goto out_err;
- 	}
-@@ -204,9 +206,9 @@
- 	else
- 		retcode = prepare_krb5_rfc_cfx_buffer(lctx, buf, endtime);
- 
--	maj_stat = gss_free_lucid_sec_context(&min_stat, ctx, return_ctx);
-+	maj_stat = gss_krb5_free_lucid_sec_context(&min_stat, ctx);
- 	if (maj_stat != GSS_S_COMPLETE) {
--		pgsserr("gss_export_lucid_sec_context",
-+		pgsserr("gss_krb5_export_lucid_sec_context",
- 			maj_stat, min_stat, &krb5oid);
- 		printerr(0, "WARN: failed to free lucid sec context\n");
- 	}
-Index: nfs-utils-1.1.6/utils/gssd/krb5_util.c
-===================================================================
---- nfs-utils-1.1.6.orig/utils/gssd/krb5_util.c
-+++ nfs-utils-1.1.6/utils/gssd/krb5_util.c
-@@ -332,10 +332,10 @@
- 		return -1;
- 	}
- 
--	maj_stat = gss_set_allowable_enctypes(&min_stat, credh, &krb5oid,
-+	maj_stat = gss_krb5_set_allowable_enctypes(&min_stat, credh,
- 					     num_enctypes, &enctypes);
- 	if (maj_stat != GSS_S_COMPLETE) {
--		pgsserr("gss_set_allowable_enctypes",
-+		pgsserr("gss_krb5_set_allowable_enctypes",
- 			maj_stat, min_stat, &krb5oid);
- 		gss_release_cred(&min_stat, &credh);
- 		return -1;
diff --git a/testing/nfs-utils/nfs-utils.install b/testing/nfs-utils/nfs-utils.install
deleted file mode 100644
index 7dcdf9575..000000000
--- a/testing/nfs-utils/nfs-utils.install
+++ /dev/null
@@ -1,32 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-cat << 'EOM'
-  ==> PLEASE NOTE:
-  ==> Extended configuration options for NFS (clients & server) are available in
-  ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf
-  ==>
-  ==> Please refer to http://wiki.archlinux.org/index.php/Nfs
-  ==> for further information on NFS; for NFSv4, refer to
-  ==> http://wiki.archlinux.org/index.php/NFSv4   
-EOM
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then
-cat << 'EOM'
-  ==> IMPORTANT NFS UTILS CHANGES:
-  ==> This is a rather important upgrade, you are going to have to change config files.
-  ==> /etc/rc.conf daemons changes:
-  ==> Change portmap to rpcbind
-  ==> Change nfslock to nfs-common
-  ==> Change nfsd to nfs-server
-  ==>
-  ==> Extended configuration options for NFS (clients & server) are available in:
-  ==> /etc/conf.d/nfs-common
-  ==> /etc/conf.d/nfs-server
-  ==> Please change them to your needs.
-EOM
-  fi
-}
diff --git a/testing/nfs-utils/start-statd.patch b/testing/nfs-utils/start-statd.patch
deleted file mode 100644
index 5d73b6e35..000000000
--- a/testing/nfs-utils/start-statd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- utils/statd/start-statd	2007-05-11 04:40:57.000000000 +0100
-+++ utils/statd/start-statd.new	2007-09-21 17:11:34.000000000 +0100
-@@ -1,9 +1,16 @@
--#!/bin/bash -p
-+#!/bin/sh
-+
-+# Original script provided by the NFS project
-+# Modified for Arch Linux by Tom Killian
-+
- # nfsmount calls this script when mounting a filesystem with locking
- # enabled, but when statd does not seem to be running (based on
- # /var/run/rpc.statd.pid).
- # It should run statd with whatever flags are apropriate for this
- # site.
--PATH=/sbin:/usr/sbin
--exec rpc.statd --no-notify
-+
-+# source application-specific settings
-+[ -f /etc/conf.d/nfs-common.conf ] && . /etc/conf.d/nfs-common.conf
-+
-+exec /usr/sbin/rpc.statd $STATD_OPTS
- 
diff --git a/testing/nspr/PKGBUILD b/testing/nspr/PKGBUILD
deleted file mode 100644
index 90dbcb6f6..000000000
--- a/testing/nspr/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 136448 2011-08-29 14:19:50Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-pkgname=nspr
-pkgver=4.8.9
-pkgrel=2
-pkgdesc="Netscape Portable Runtime"
-arch=(i686 x86_64)
-url="http://www.mozilla.org/projects/nspr/"
-license=('MPL' 'GPL')
-depends=('glibc')
-makedepends=('zip')
-options=(!emptydirs)
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
-        nspr.pc.in)
-md5sums=('60770d45dc08c0f181b22cdfce5be3e8'
-         'bce1611f3117b53fc904cab549c09967')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  if [ "$CARCH" = "x86_64" ]; then
-    confflags="--enable-64bit"
-  else
-    confflags=""
-  fi
-
-  sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-      -i mozilla/nsprpub/config/rules.mk
-
-  ./mozilla/nsprpub/configure \
-      --prefix=/usr \
-      --libdir=/usr/lib \
-      --includedir=/usr/include/nspr \
-      --enable-optimize \
-      --disable-debug ${confflags}
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  NSPR_LIBS=`./config/nspr-config --libs`
-  NSPR_CFLAGS=`./config/nspr-config --cflags`
-  NSPR_VERSION=`./config/nspr-config --version`
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib," \
-  	-e "s,%prefix%,/usr," \
-	-e "s,%exec_prefix%,/usr/bin," \
-	-e "s,%includedir%,/usr/include/nspr," \
-	-e "s,%NSPR_VERSION%,${NSPR_VERSION}," \
-	-e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \
-	-e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
-  chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
-  ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc"
-
-  chmod 644 ${pkgdir}/usr/lib/*.a
-
-  rm -rf "${pkgdir}/usr/bin/compile-et.pl" \
-	"${pkgdir}/usr/bin/prerr.properties" \
-	"${pkgdir}/usr/share/aclocal/nspr.m4" \
-	"${pkgdir}/usr/include/nspr/md"
-}
diff --git a/testing/nspr/nspr.pc.in b/testing/nspr/nspr.pc.in
deleted file mode 100644
index 1d8f4a0ca..000000000
--- a/testing/nspr/nspr.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSPR
-Description: The Netscape Portable Runtime
-Version: %NSPR_VERSION%
-Libs: %FULL_NSPR_LIBS%
-Cflags: %FULL_NSPR_CFLAGS%
diff --git a/testing/opal/PKGBUILD b/testing/opal/PKGBUILD
deleted file mode 100644
index b1c1dcdf7..000000000
--- a/testing/opal/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 139583 2011-10-03 14:22:35Z ibiru $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-pkgname=opal
-pkgver=3.10.2
-pkgrel=2
-pkgdesc="Open Phone Abstraction Library"
-arch=(i686 x86_64)
-url="http://www.ekiga.org"
-license=('GPL')
-depends=('ptlib' 'libtheora' 'x264' 'speex')
-makedepends=('ffmpeg')
-options=(!makeflags)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('8e227978263c07502b2bc4c9de0e71be1b95d673fe858bfd907910adfb2eb205')
-
-build() {
-  cd "${srcdir}/opal-${pkgver}"
-  CXXFLAGS="$CXXFLAGS -fpermissive" \
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/opal-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/openldap/PKGBUILD b/testing/openldap/PKGBUILD
deleted file mode 100644
index d12720e4c..000000000
--- a/testing/openldap/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# $Id: PKGBUILD 138388 2011-09-21 13:18:13Z stephane $
-# Maintainer:
-
-pkgbase=openldap
-pkgname=('libldap' 'openldap')
-pkgver=2.4.26
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.openldap.org/"
-license=('custom')
-makedepends=('groff' 'libfetch' 'e2fsprogs' 'libtool' 'util-linux' 'libsasl')
-source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
-        slapd slapd.default ntlm.patch)
-md5sums=('f36f3086031dd56ae94f722ffae8df5e'
-         '40fdbdd6c343019cbadf4eb26c6189f2'
-         '6be69f6b7e522cb64cce8703da81ed32'
-         '4258ddbef923d1f29f2843bc050f8c56')
-
-build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -Np1 -i "${srcdir}"/ntlm.patch
-  sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in
-  sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h
-  sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf
-  sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
-
-  LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib" 
-  ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \
-    --sysconfdir=/etc --localstatedir=/var/lib/openldap \
-    --enable-ipv6 --enable-syslog --enable-local \
-    --enable-bdb --enable-hdb \
-    --enable-crypt --enable-dynamic \
-    --with-threads  --disable-wrappers \
-    --enable-spasswd --with-cyrus-sasl \
-    --enable-overlays=mod --enable-modules=yes
-  make
-}
-
-check() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  make test
-}
-
-package_libldap() {
-  pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
-  depends=('libsasl' 'libfetch' 'e2fsprogs')
-  backup=('etc/openldap/ldap.conf')
-  options=('!libtool')
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  for dir in include libraries doc/man/man3 ; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-  install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5
-  
-# get rid of duplicate default conf files
-  rm "${pkgdir}"/etc/openldap/*.default
-
-  ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2
-  ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2
-
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_openldap() {
-  pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server"
-  depends=("libldap>=${pkgver}" 'libtool' 'util-linux')
-  backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd')
-  options=('!libtool' 'emptydirs')
-  install=openldap.install
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  for dir in clients servers doc/man/man{1,5,8} ; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-  rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
-  rm -r "${pkgdir}"/run
-
-# get rid of duplicate default conf files
-  rm "${pkgdir}"/etc/openldap/*.default
-
-  ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd
-
-  chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
-  chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
-
-  install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap
-  install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d
-  install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd
-  install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/openldap/ntlm.patch b/testing/openldap/ntlm.patch
deleted file mode 100644
index 6804b610d..000000000
--- a/testing/openldap/ntlm.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-Patch from evolution-exchange (2.10.3).  The ldap_ntlm_bind function is
-actually called by evolution-data-server, checked at version 1.12.2.
-Without this patch, the Exchange addressbook integration uses simple binds
-with cleartext passwords.
-
-Russ checked with openldap-software for upstream's opinion on this patch
-on 2007-12-21.  Upstream had never received it as a patch submission and
-given that it's apparently only for older Exchange servers that can't do
-SASL and DIGEST-MD5, it's not very appealing.
-
-Bug#457374 filed against evolution-data-server asking if this support is
-still required on 2007-12-21.
-
-Index: trunk/include/ldap.h
-===================================================================
---- trunk.orig/include/ldap.h
-+++ trunk/include/ldap.h
-@@ -2461,5 +2461,25 @@
- 	LDAPControl	**ctrls,
- 	LDAPDerefRes	**drp ));
- 
-+/*
-+ * hacks for NTLM
-+ */
-+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
-+#define LDAP_AUTH_NTLM_RESPONSE  ((ber_tag_t) 0x8bU)
-+LDAP_F( int )
-+ldap_ntlm_bind LDAP_P((
-+      LDAP    *ld,
-+      LDAP_CONST char *dn,
-+      ber_tag_t tag,
-+      struct berval *cred,
-+      LDAPControl **sctrls,
-+      LDAPControl **cctrls,
-+      int   *msgidp ));
-+LDAP_F( int )
-+ldap_parse_ntlm_bind_result LDAP_P((
-+      LDAP    *ld,
-+      LDAPMessage *res,
-+      struct berval *challenge));
-+
- LDAP_END_DECL
- #endif /* _LDAP_H */
-Index: trunk/libraries/libldap/ntlm.c
-===================================================================
---- /dev/null
-+++ trunk/libraries/libldap/ntlm.c
-@@ -0,0 +1,138 @@
-+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
-+/*
-+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+ */
-+
-+/* Mostly copied from sasl.c */
-+
-+#include "portable.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+#include <ac/socket.h>
-+#include <ac/string.h>
-+#include <ac/time.h>
-+#include <ac/errno.h>
-+
-+#include "ldap-int.h"
-+
-+int
-+ldap_ntlm_bind(
-+ LDAP    *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int   *msgidp )
-+{
-+ BerElement  *ber;
-+ int rc;
-+ ber_int_t id;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( msgidp != NULL );
-+
-+ if( msgidp == NULL ) {
-+   ld->ld_errno = LDAP_PARAM_ERROR;
-+   return ld->ld_errno;
-+ }
-+
-+ /* create a message to send */
-+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+   ld->ld_errno = LDAP_NO_MEMORY;
-+   return ld->ld_errno;
-+ }
-+
-+ assert( LBER_VALID( ber ) );
-+
-+ LDAP_NEXT_MSGID( ld, id );
-+ rc = ber_printf( ber, "{it{istON}" /*}*/,
-+      id, LDAP_REQ_BIND,
-+      ld->ld_version, dn, tag,
-+      cred );
-+
-+ /* Put Server Controls */
-+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+   ber_free( ber, 1 );
-+   return ld->ld_errno;
-+ }
-+
-+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+   ld->ld_errno = LDAP_ENCODING_ERROR;
-+   ber_free( ber, 1 );
-+   return ld->ld_errno;
-+ }
-+
-+ /* send the message */
-+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
-+
-+ if(*msgidp < 0)
-+   return ld->ld_errno;
-+
-+ return LDAP_SUCCESS;
-+}
-+
-+int
-+ldap_parse_ntlm_bind_result(
-+ LDAP    *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge)
-+{
-+ ber_int_t errcode;
-+ ber_tag_t tag;
-+ BerElement  *ber;
-+ ber_len_t len;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( res != NULL );
-+
-+ if ( ld == NULL || res == NULL ) {
-+   return LDAP_PARAM_ERROR;
-+ }
-+
-+ if( res->lm_msgtype != LDAP_RES_BIND ) {
-+   ld->ld_errno = LDAP_PARAM_ERROR;
-+   return ld->ld_errno;
-+ }
-+
-+ if ( ld->ld_error ) {
-+   LDAP_FREE( ld->ld_error );
-+   ld->ld_error = NULL;
-+ }
-+ if ( ld->ld_matched ) {
-+   LDAP_FREE( ld->ld_matched );
-+   ld->ld_matched = NULL;
-+ }
-+
-+ /* parse results */
-+
-+ ber = ber_dup( res->lm_ber );
-+
-+ if( ber == NULL ) {
-+   ld->ld_errno = LDAP_NO_MEMORY;
-+   return ld->ld_errno;
-+ }
-+
-+ tag = ber_scanf( ber, "{ioa" /*}*/,
-+      &errcode, challenge, &ld->ld_error );
-+ ber_free( ber, 0 );
-+
-+ if( tag == LBER_ERROR ) {
-+   ld->ld_errno = LDAP_DECODING_ERROR;
-+   return ld->ld_errno;
-+ }
-+
-+ ld->ld_errno = errcode;
-+
-+ return( ld->ld_errno );
-+}
-+
-Index: trunk/libraries/libldap/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap/Makefile.in
-+++ trunk/libraries/libldap/Makefile.in
-@@ -27,7 +27,7 @@
- 	init.c options.c print.c string.c util-int.c schema.c \
- 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- 	tls2.c tls_o.c tls_g.c tls_m.c \
--	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
- 	assertion.c deref.c ldif.c fetch.c
- 
- OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
-@@ -40,7 +40,7 @@
- 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
--	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
- 	assertion.lo deref.lo ldif.lo fetch.lo
- 
- LDAP_INCDIR= ../../include       
-Index: trunk/libraries/libldap_r/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap_r/Makefile.in
-+++ trunk/libraries/libldap_r/Makefile.in
-@@ -29,7 +29,7 @@
- 	init.c options.c print.c string.c util-int.c schema.c \
- 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- 	tls2.c tls_o.c tls_g.c tls_m.c \
--	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
- 	assertion.c deref.c ldif.c fetch.c
- SRCS	= threads.c rdwr.c rmutex.c tpool.c rq.c \
- 	thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
-@@ -47,7 +47,7 @@
- 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
--	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
- 	assertion.lo deref.lo ldif.lo fetch.lo
- 
- LDAP_INCDIR= ../../include       
diff --git a/testing/openldap/openldap.install b/testing/openldap/openldap.install
deleted file mode 100644
index cf3cb9f25..000000000
--- a/testing/openldap/openldap.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install(){
-  groupadd -g 439 ldap &>/dev/null
-  useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
-  chown -R ldap:ldap var/lib/openldap &>/dev/null
-}
-
-post_upgrade(){
-  getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null
-  getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
-  chown -R ldap:ldap var/lib/openldap &>/dev/null
-}
-
-post_remove(){
-  if getent passwd ldap >/dev/null 2>&1; then
-    userdel ldap
-  fi
-  if getent group ldap >/dev/null 2>&1; then
-    groupdel ldap
-  fi
-}
diff --git a/testing/openldap/slapd b/testing/openldap/slapd
deleted file mode 100755
index 4f212da66..000000000
--- a/testing/openldap/slapd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd
-
-PID=`pidof -o %PPID /usr/sbin/slapd`
-case "$1" in
-  start)
-    stat_busy "Starting OpenLDAP"
-    [ ! -d /run/openldap ] && install -d -m755 -o ldap -g ldap /run/openldap
-    if [ -z "$PID" ]; then
-      if [ -z "$SLAPD_SERVICES" ]; then
-        /usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS
-      else
-        /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS
-      fi
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-      add_daemon slapd
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OpenLDAP"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /run/openldap/slapd.pid
-      rm -f /run/openldap/slapd.args
-      rm_daemon slapd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/openldap/slapd.default b/testing/openldap/slapd.default
deleted file mode 100644
index 72ae2a6a7..000000000
--- a/testing/openldap/slapd.default
+++ /dev/null
@@ -1,6 +0,0 @@
-# slapd normally serves ldap only on all TCP-ports 389. slapd can also
-# service requests on TCP-port 636 (ldaps) and requests via unix
-# sockets.
-# Example usage:
-#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///"
-SLAPD_OPTIONS=""
diff --git a/testing/pango/PKGBUILD b/testing/pango/PKGBUILD
deleted file mode 100644
index 97d393fd4..000000000
--- a/testing/pango/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 139031 2011-09-28 19:32:50Z ibiru $ 
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pango
-pkgver=1.29.4
-pkgrel=1
-pkgdesc="A library for layout and rendering of text"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('glib2' 'cairo' 'libxft' 'libthai' 'freetype2')
-makedepends=('gobject-introspection' 'libxt' 'gtk-doc')
-options=('!libtool' '!emptydirs')
-install=pango.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.29/${pkgname}-${pkgver}.tar.xz)
-url="http://www.pango.org/"
-sha256sums=('7ae8d1953e6098a2706df58c1f84555c06ace7006bb34c0e54ab9acd98c1127f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --with-included-modules=basic-fc
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/pango/pango.install b/testing/pango/pango.install
deleted file mode 100644
index 73b0f5bf1..000000000
--- a/testing/pango/pango.install
+++ /dev/null
@@ -1,21 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-	# we need to ldconfig first, in case xfree86's libs aren't
-	# in ld.so.cache yet
-	sbin/ldconfig -r .
-	usr/bin/pango-querymodules >etc/pango/pango.modules
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	if [ -f usr/etc/pango/pango.modules ]; then
-		rm usr/etc/pango/pango.modules
-	fi
-	post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-	rm etc/pango/pango.modules
-}
diff --git a/testing/paprefs/PKGBUILD b/testing/paprefs/PKGBUILD
deleted file mode 100644
index 72192a1bd..000000000
--- a/testing/paprefs/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 139033 2011-09-28 19:32:53Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=paprefs
-pkgver=0.9.10
-pkgrel=1
-pkgdesc="A simple GTK-based configuration dialog for PulseAudio"
-arch=(i686 x86_64)
-url="http://0pointer.de/lennart/projects/paprefs"
-license=(GPL)
-depends=(gconfmm gnome-icon-theme libglademm libsigc++ pulseaudio)
-makedepends=(intltool)
-source=(http://0pointer.de/lennart/projects/paprefs/$pkgname-$pkgver.tar.gz
-        paprefs.desktop)
-md5sums=('15bc6caea388e4de17e8746293cfb529'
-         '20dc978f0bd4a0bf925a4eaf80a2b8f8')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-lynx
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/paprefs.desktop" \
-    "$pkgdir/usr/share/applications/paprefs.desktop"
-}
diff --git a/testing/paprefs/paprefs.desktop b/testing/paprefs/paprefs.desktop
deleted file mode 100644
index d51635533..000000000
--- a/testing/paprefs/paprefs.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=PulseAudio Preferences
-Name[de]=PulseAudio-Einstellungen
-GenericName=Sound Server Preferences
-GenericName[de]=Audio-Dienst-Einstellungen
-Comment=View and modify the configuration of the local sound server
-Comment[de]=Anzeigen und Ändern der Konfiguration des lokalen Audio-Dienstes
-Exec=paprefs
-Icon=preferences-desktop
-StartupNotify=true
-Type=Application
-Categories=Settings;
diff --git a/testing/pavucontrol/PKGBUILD b/testing/pavucontrol/PKGBUILD
deleted file mode 100644
index 03adef548..000000000
--- a/testing/pavucontrol/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 139035 2011-09-28 19:32:54Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=pavucontrol
-pkgver=1.0
-pkgrel=1
-pkgdesc="A GTK volume control tool for PulseAudio"
-arch=(i686 x86_64)
-url="http://0pointer.de/lennart/projects/pavucontrol"
-license=(GPL)
-depends=(gnome-icon-theme libcanberra-pulse gtkmm3 libsigc++)
-makedepends=(intltool lynx)
-source=(http://freedesktop.org/software/pulseaudio/$pkgname/$pkgname-$pkgver.tar.xz
-        pavucontrol.desktop)
-sha256sums=('3dbe2865b6e3a195a8951967d9234f62cd254c30b08bdea1ecf8997b58f68cde'
-            '5eab8c78e92c39a71ac1ca4c4464a8915d3a29d91e1703fd51c24652b747eebe')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --enable-gtk3
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/pavucontrol.desktop" \
-    "$pkgdir/usr/share/applications/pavucontrol.desktop"
-}
diff --git a/testing/pavucontrol/pavucontrol.desktop b/testing/pavucontrol/pavucontrol.desktop
deleted file mode 100644
index 842dc96b6..000000000
--- a/testing/pavucontrol/pavucontrol.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=PulseAudio Volume Control
-GenericName=Volume Control
-Comment=Adjust the volume level
-Exec=pavucontrol
-Icon=multimedia-volume-control
-StartupNotify=true
-Type=Application
-Categories=AudioVideo;Audio;
-GenericName[en_GB]=Volume Control
diff --git a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
deleted file mode 100644
index 1404460df..000000000
--- a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Thu, 28 Apr 2011 09:18:54 +0300
-Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in
- EU::CBuilder
-
-Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4),
-CFLAGS and LDFLAGS from the environment have overridden the Config.pm
-ccflags and ldflags settings. This can cause binary incompatibilities
-between the core Perl and extensions built with EU::CBuilder.
-
-Append to the Config.pm values rather than overriding them.
----
- .../lib/ExtUtils/CBuilder/Base.pm                  |    6 +++-
- dist/ExtUtils-CBuilder/t/04-base.t                 |   25 +++++++++++++++++++-
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-index b572312..2255c51 100644
---- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-+++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-@@ -40,11 +40,13 @@ sub new {
-     $self->{config}{$k} = $v unless exists $self->{config}{$k};
-   }
-   $self->{config}{cc} = $ENV{CC} if defined $ENV{CC};
--  $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS};
-+  $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS})
-+     if defined $ENV{CFLAGS};
-   $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX};
-   $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS};
-   $self->{config}{ld} = $ENV{LD} if defined $ENV{LD};
--  $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS};
-+  $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS})
-+     if defined $ENV{LDFLAGS};
- 
-   unless ( exists $self->{config}{cxx} ) {
-     my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/);
-diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t
-index c3bf6b5..1bb15aa 100644
---- a/dist/ExtUtils-CBuilder/t/04-base.t
-+++ b/dist/ExtUtils-CBuilder/t/04-base.t
-@@ -1,7 +1,7 @@
- #! perl -w
- 
- use strict;
--use Test::More tests => 50;
-+use Test::More tests => 64;
- use Config;
- use Cwd;
- use File::Path qw( mkpath );
-@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args,
-     "_prepare_mksymlists_args(): got expected arguments for Mksymlists",
- );
- 
-+my %testvars = (
-+    CFLAGS  => 'ccflags',
-+    LDFLAGS => 'ldflags',
-+);
-+
-+while (my ($VAR, $var) = each %testvars) {
-+    local $ENV{$VAR};
-+    $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+    ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+    isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+    like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+        "honours $var from Config.pm");
-+
-+    $ENV{$VAR} = "-foo -bar";
-+    $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+    ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+    isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+    like($base->{config}{$var}, qr/\Q$ENV{$VAR}/,
-+        "honours $VAR from the environment");
-+    like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+        "doesn't override $var from Config.pm with $VAR from the environment");
-+}
-+
- #####
- 
- for ($source_file, $object_file, $lib_file) {
--- 
-1.7.4.4
-
diff --git a/testing/perl/ChangeLog b/testing/perl/ChangeLog
deleted file mode 100644
index 9add39e20..000000000
--- a/testing/perl/ChangeLog
+++ /dev/null
@@ -1,66 +0,0 @@
-2011-06-22 Angel Velasquez <angvp@archlinux.org>
-    * Added a patch for ExtUtils doesnt overwrite CFLAGS and LDFLAGS
-    * Fixed #FS22197, FS#22441, FS#24767
-    * Rebuilt perl 5.14.1-2 against db 5.2.28
-
-2011-06-16 Angel Velasquez <angvp@archlinux.org>
-    * Fixed #FS24660
-    * Rebuilt against db 5.2.28
-
-2011-05-16  Angel Velasquez <angvp@archlinux.org>
-    * perl 5.14.0
-    * Removed patch for h2ph warning from 5.12.3
-    * Removed provides array, you can use corelist -v 5.14.0 to know the
-    modules included with the perl core, through Module::CoreList (thx j3nnn1
-    for the tip)
-
-2010-11-07  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.2-1
-    - Using /usr/bin/*_perl for script directories
-
-2010-11-06  kevin  <kevin@archlinux.org>
-
-    - Removed otherlibdirs directive from Configure
-    - Removed /usr/*/perl5/site_perl/5.10.1 from INC
-    - Finally removed legacy dirs /usr/lib/perl5/current and
-      /usr/lib/perl5/site_perl/current from @INC
-
-2010-05-23  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.1-2
-    - Francois updated the provides array.
-
-2010-05-23  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.1-1
-
-2010-05-16  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.0-2
-
-2010-05-12  kevin  <kevin@archlinux.org>
-
-    - FS#19411.  Removed the for loop in perlbin.sh which didn't work on zsh.
-      This makes the loop variables unnecessary so the script no longer
-      pollutes the user's environment.
-    - FS#19427.  Added /usr/*/perl5/site_perl/5.10.1 to otherlibdirs to support
-      user built modules.
-
-2010-05-09  kevin  <kevin@archlinux.org>
-
-    * perl 5.12.0-1
-    - Modified perlbin.sh to only add existing dirs to PATH.  Fixes FS#17402,
-      path points to non-existant directories 
-
-2010-05-07  kevin  <kevin@archlinux.org>
-
-    - Added this changelog.
-    - Added -Dinc_version_list=none to fix FS#19136, double entry in @INC.
-      This removes the duplicates and versioned directory entries.
-    - Change scriptdirs to /usr/lib/perl5/{core,vendor,site}_perl/bin to fix
-      Fix FS#13808, binaries don't follow FHS.
-    - Stopped using versioned directories in sitelib and sitearch.
-
-
-# vim: set ft=changelog ts=4 sw=4 et:
diff --git a/testing/perl/PKGBUILD b/testing/perl/PKGBUILD
deleted file mode 100644
index ef43cbef6..000000000
--- a/testing/perl/PKGBUILD
+++ /dev/null
@@ -1,109 +0,0 @@
-# $Id: PKGBUILD 138681 2011-09-27 15:46:12Z bluewind $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: kevin <kevin.archlinux.org>
-# Contributor: judd <jvinet.zeroflux.org>
-# Contributor: francois <francois.archlinux.org> 
-pkgname=perl
-pkgver=5.14.2
-pkgrel=2
-pkgdesc="A highly capable, feature-rich programming language"
-arch=(i686 x86_64)
-license=('GPL' 'PerlArtistic')
-url="http://www.perl.org"
-groups=('base')
-depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh')
-changelog=ChangeLog
-source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 
-perlbin.sh
-perlbin.csh
-provides.pl
-0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch)
-install=perl.install
-options=('!makeflags' '!purge')
-md5sums=('04a4c5d3c1f9f19d77daff8e8cd19a26'
-         '5ed2542fdb9a60682f215bd33701e61a'
-         '1f0cbbee783e8a6d32f01be5118e0d5e'
-         '31fc0b5bb4935414394c5cfbec2cb8e5'
-         'c25d86206d649046538c3daab7874564')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    # for x86_64
-    arch_opts="-Dcccdlflags='-fPIC'"
-  else 
-    # for i686
-    arch_opts=""
-  fi
-  ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \
-    -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \
-    -Dprivlib=/usr/share/perl5/core_perl \
-    -Darchlib=/usr/lib/perl5/core_perl \
-    -Dsitelib=/usr/share/perl5/site_perl \
-    -Dsitearch=/usr/lib/perl5/site_perl \
-    -Dvendorlib=/usr/share/perl5/vendor_perl \
-    -Dvendorarch=/usr/lib/perl5/vendor_perl \
-    -Dscriptdir=/usr/bin/core_perl \
-    -Dsitescript=/usr/bin/site_perl \
-    -Dvendorscript=/usr/bin/vendor_perl \
-    -Dinc_version_list=none \
-    -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \
-    -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}"
-  patch -Np1 -i $srcdir/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
-  make
-}
-package() {
-  # hack to work around makepkg running the subshell in check_sanity()
-  new_provides=($(cd "$srcdir/perl-$pkgver"; LD_PRELOAD=./libperl.so ./perl -Ilib "$srcdir/provides.pl" .))
-  provides=(${new_provides[@]})
-
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make install
-
-  ### Perl Settings ###
-  # Change man page extensions for site and vendor module builds.
-  # Use archlinux email address instead of my own.
-  sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \
-      -e "/^cf_email=/ s/'.*'/'kevin@archlinux.org'/" \
-      -e "/^perladmin=/ s/'.*'/'kevin@archlinux.org'/" \
-      -i ${pkgdir}/usr/lib/perl5/core_perl/Config_heavy.pl
-
-  ### CPAN Settings ###
-  # Set CPAN default config to use the site directories.
-  sed -e '/(makepl_arg =>/   s/""/"INSTALLDIRS=site"/' \
-      -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \
-      -i ${pkgdir}/usr/share/perl5/core_perl/CPAN/FirstTime.pm
-
-  ### CPANPLUS Settings ###
-  # Set CPANPLUS default config to use the site directories.
-  sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \
-      -e "/{'buildflags'}/     s/'';/'installdirs=site';/" \
-      -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm
-
-  # Profile script to set paths to perl scripts.
-  install -D -m755 ${srcdir}/perlbin.sh \
-                   ${pkgdir}/etc/profile.d/perlbin.sh
-  # Profile script to set paths to perl scripts on csh. (FS#22441) 
-  install -D -m755 ${srcdir}/perlbin.csh \
-                  ${pkgdir}/etc/profile.d/perlbin.csh
-
-  (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl)
-  (cd ${pkgdir}/usr/bin/core_perl;  ln -sf c2ph pstruct; ln -sf s2p psed)
-  grep -Rl "${pkgdir}" ${pkgdir}/usr | \
-      xargs sed -i "s^${pkgdir}^^g"
-
-  # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/
-  # (FS#16488)
-  rm -f $pkgdir/usr/share/perl5/core_perl/*.pod
-  for d in $pkgdir/usr/share/perl5/core_perl/*; do
-    if [ -d $d -a $(basename $d) != "pod" ]; then
-      find $d -name *.pod -delete
-    fi
-  done
-  find $pkgdir/usr/lib -name *.pod -delete
-  find $pkgdir -name .packlist -delete
-  # Add /usr/lib/perl5/core_perl/CORE/ to standard library path (FS#24660) 
-  install -dv ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf
-}
diff --git a/testing/perl/fix-h2ph-and-tests.patch b/testing/perl/fix-h2ph-and-tests.patch
deleted file mode 100644
index a2d176ec6..000000000
--- a/testing/perl/fix-h2ph-and-tests.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 8d66b3f930dc6d88b524d103e304308ae73a46e7 Mon Sep 17 00:00:00 2001
-From: Robin Barker <rmbarker@cpan.org>
-Date: Thu, 22 Apr 2010 11:51:20 +0100
-Subject: [PATCH 1/1] Fix h2ph and test
-
----
- lib/h2ph.t    |   12 ++++++++++--
- utils/h2ph.PL |   28 +++++++++++++++++++++++-----
- 2 files changed, 33 insertions(+), 7 deletions(-)
-
-diff --git a/lib/h2ph.t b/lib/h2ph.t
-index 27dd7b9..8d62d46 100644
---- a/lib/h2ph.t
-+++ b/lib/h2ph.t
-@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) {
-     exit 0;
- }
- 
--plan(4);
-+plan(5);
- 
- # quickly compare two text files
- sub txt_compare {
-@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht',
-                    stderr => 1 );
- like( $result, qr/syntax OK$/, "output compiles");
- 
-+$result = runperl( progfile => '_h2ph_pre.ph',
-+                   switches => ['-c'],
-+                   stderr => 1 );
-+like( $result, qr/syntax OK$/, "preamble compiles");
-+
- $result = runperl( switches => ["-w"], 
--                   prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);');
-+                   stderr => 1,
-+                   prog => <<'PROG' );
-+$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);
-+PROG
- is( $result, '', "output free of warnings" );
- 
- # cleanup
-diff --git a/utils/h2ph.PL b/utils/h2ph.PL
-index 8f56db4..1255807 100644
---- a/utils/h2ph.PL
-+++ b/utils/h2ph.PL
-@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) {
- exit $Exit;
- 
- sub expr {
--    $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out.
-+    if (/\b__asm__\b/) {	# freak out
-+	$new = '"(assembly code)"';
-+	return
-+    }
-     my $joined_args;
-     if(keys(%curargs)) {
- 	$joined_args = join('|', keys(%curargs));
-@@ -770,7 +773,7 @@ sub inc_dirs
- sub build_preamble_if_necessary
- {
-     # Increment $VERSION every time this function is modified:
--    my $VERSION     = 2;
-+    my $VERSION     = 3;
-     my $preamble    = "$Dest_dir/_h2ph_pre.ph";
- 
-     # Can we skip building the preamble file?
-@@ -798,7 +801,16 @@ sub build_preamble_if_necessary
- 		# parenthesized value:  d=(v)
- 		$define{$_} = $1;
- 	    }
--	    if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
-+	    if (/^(\w+)\((\w)\)$/) {
-+		my($macro, $arg) = ($1, $2);
-+		my $def = $define{$_};
-+		$def =~ s/$arg/\$\{$arg\}/g;
-+		print PREAMBLE <<DEFINE;
-+unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } }
-+
-+DEFINE
-+	    } elsif
-+		($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
- 		# float:
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { $1 } }\n\n";
-@@ -807,8 +819,14 @@ sub build_preamble_if_necessary
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { $1 } }\n\n";
- 	    } elsif ($define{$_} =~ /^\w+$/) {
--		print PREAMBLE
--		    "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
-+		my $def = $define{$_};
-+		if ($isatype{$def}) {
-+		  print PREAMBLE
-+		    "unless (defined &$_) { sub $_() { \"$def\" } }\n\n";
-+		} else {
-+		  print PREAMBLE
-+		    "unless (defined &$_) { sub $_() { &$def } }\n\n";
-+	        }
- 	    } else {
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { \"",
--- 
-1.6.5.2.74.g610f9.dirty
-
diff --git a/testing/perl/perl.install b/testing/perl/perl.install
deleted file mode 100644
index a355c5bbe..000000000
--- a/testing/perl/perl.install
+++ /dev/null
@@ -1,10 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do
-    [ -h usr/lib/perl5/$ver ] && rm usr/lib/perl5/$ver
-    [ -h usr/lib/perl5/site_perl/$ver ] && rm usr/lib/perl5/site_perl/$ver
-    [ -h usr/bin/perl$ver ] && rm usr/bin/perl$ver
-  done
-  return 0
-}
-
diff --git a/testing/perl/perlbin.csh b/testing/perl/perlbin.csh
deleted file mode 100644
index 535f0b18d..000000000
--- a/testing/perl/perlbin.csh
+++ /dev/null
@@ -1,15 +0,0 @@
-# Set path to perl scriptdirs if they exist
-# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts
-# Added /usr/bin/*_perl dirs for scripts
-# Remove /usr/lib/perl5/*_perl/bin in next release
-
-[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl
-[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/site_perl/bin
-
-[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl
-[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/vendor_perl/bin
-
-[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl
-
-# If you have modules in non-standard directories you can add them here.
-#export PERLLIB=dir1:dir2
diff --git a/testing/perl/perlbin.sh b/testing/perl/perlbin.sh
deleted file mode 100755
index 20f830436..000000000
--- a/testing/perl/perlbin.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# Set path to perl scriptdirs if they exist
-# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts
-# Added /usr/bin/*_perl dirs for scripts
-# Remove /usr/lib/perl5/*_perl/bin in next release
-
-[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl
-[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin
-
-[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl
-[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin
-
-[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl
-
-export PATH
-
-# If you have modules in non-standard directories you can add them here.
-#export PERLLIB=dir1:dir2
-
diff --git a/testing/perl/provides.pl b/testing/perl/provides.pl
deleted file mode 100644
index 3bf369577..000000000
--- a/testing/perl/provides.pl
+++ /dev/null
@@ -1,286 +0,0 @@
-# provides.pl
-##
-# Script for printing out a provides list of every CPAN distribution
-# that is bundled with perl.
-#
-# Justin Davis <jrcd83@gmail.com>
-
-use warnings 'FATAL' => 'all';
-use strict;
-
-package Common;
-
-sub evalver
-{
-    my ($path, $mod) = @_;
-    $mod ||= "";
-
-    open my $fh, '<', $path or die "open $path: $!";
-
-    while (<$fh>) {
-        next unless /\s*(?:\$${mod}::|\$)VERSION\s*=\s*(.+)/;
-        my $ver = eval $1;
-        return $ver unless $@;
-        warn qq{$path:$. bad version string "$ver"\n};
-    }
-
-    close $fh;
-    return undef;
-}
-
-#-----------------------------------------------------------------------------
-
-package Dists;
-
-sub maindistfile
-{
-    my ($dist, $dir) = @_;
-
-    # libpath is the modern style, installing modules under lib/
-    # with dirs matching the name components.
-    my $libpath = join q{/}, 'lib', split /-/, "${dist}.pm";
-
-    # dumbpath is an old style where there's no subdirs and just
-    # a .pm file.
-    my $dumbpath = $dist;
-    $dumbpath =~ s/\A.+-//;
-    $dumbpath .= ".pm";
-
-    my @paths = ($libpath, $dumbpath);
-    # Some modules (with simple names like XSLoader, lib, etc) are
-    # generated by Makefile.PL. Search through their generating code.
-    push @paths, "${dist}_pm.PL" if $dist =~ tr/-/-/ == 0;
-
-    for my $path (map { "$dir/$_" } @paths) { return $path if -f $path; }
-    return undef;
-}
-
-sub module_ver
-{
-    my ($dist, $dir) = @_;
-
-    my $path = maindistfile($dist, $dir) or return undef;
-
-    my $mod = $dist;
-    $mod =~ s/-/::/g;
-    my $ver = Common::evalver($path, $mod);
-    unless ($ver) {
-        warn "failed to find version in module file for $dist\n";
-        return undef;
-    }
-
-    return $ver;
-}
-
-sub changelog_ver
-{
-    my ($dist, $dir) = @_;
-
-    my $path;
-    for my $tmp (glob "$dir/{Changes,ChangeLog}") {
-        if (-f $tmp) { $path = $tmp; last; }
-    }
-    return undef unless $path;
-
-    open my $fh, '<', $path or die "open: $!";
-    while (<$fh>) {
-        return $1 if /\A\s*(?:$dist[ \t]*)?([0-9._]+)/;
-        return $1 if /\A\s*version\s+([0-9._]+)/i;
-    }
-    close $fh;
-
-    return undef;
-}
-
-# for some reason podlators has a VERSION file with perl code in it
-sub verfile_ver
-{
-    my ($dist, $dir) = @_;
-
-    my $path = "$dir/VERSION";
-    return undef unless -f $path; # no warning, only podlaters has it
-
-    return Common::evalver($path);
-}
-
-# scans a directory full of nicely separated dist. directories.
-sub scan_distroot
-{
-    my ($distroot) = @_;
-    opendir my $cpand, "$distroot" or die "failed to open $distroot";
-    my @dists = grep { !/^\./ && -d "$distroot/$_" } readdir $cpand;
-    closedir $cpand;
-
-    my @found;
-    for my $dist (@dists) {
-        my $distdir = "$distroot/$dist";
-        my $ver = (module_ver($dist, $distdir)
-                   || changelog_ver($dist, $distdir)
-                   || verfile_ver($dist, $distdir));
-
-        if ($ver) { push @found, [ $dist, $ver ]; }
-        else { warn "failed to find version for $dist\n"; }
-    }
-    return @found;
-}
-
-sub find
-{
-    my ($srcdir) = @_;
-    return map { scan_distroot($_) } glob "$srcdir/{cpan,dist}";
-}
-
-#-----------------------------------------------------------------------------
-
-package Modules;
-
-use HTTP::Tiny qw();
-use File::Find qw();
-use File::stat;
-
-*findfile = *File::Find::find;
-
-sub cpan_provider
-{
-    my ($module) = @_;
-    my $url = "http://cpanmetadb.appspot.com/v1.0/package/$module";
-    my $http = HTTP::Tiny->new;
-    my $resp = $http->get($url);
-    return undef unless $resp->{'success'};
-
-    my ($cpanpath) = $resp->{'content'} =~ /^distfile: (.*)$/m
-        or return undef;
-
-    my $dist = $cpanpath;
-    $dist =~ s{\A.+/}{};    # remove author directory
-    $dist =~ s{-[^-]+\z}{}; # remove version and extension
-    return ($dist eq 'perl' ? undef : $dist);
-}
-
-sub find
-{
-    my ($srcdir) = @_;
-    my $libdir = "$srcdir/lib/";
-    die "failed to find $libdir directory" unless -d $libdir;
-
-    # Find only the module files that have not changed since perl
-    # was extracted. We don't want the files perl just recently
-    # installed into lib/. We processed those already.
-    my @modfiles;
-    my $finder = sub {
-        return unless /[.]pm\z/;
-        push @modfiles, $_;
-    };
-    findfile({ 'no_chdir' => 1, 'wanted' => $finder }, $libdir);
-
-    # First we have to find what the oldest ctime actually is.
-    my $oldest = time;
-    @modfiles = map {
-        my $modfile = $_;
-        my $ctime = (stat $modfile)->ctime;
-        $oldest = $ctime if $ctime < $oldest;
-        [ $modfile, $ctime ]; # save ctime for later
-    } @modfiles;
-
-    # Then we filter out any file that was created more than a
-    # few seconds after that. Process the rest.
-    my @mods;
-    for my $modfile (@modfiles) {
-        my ($mod, $ctime) = @$modfile;
-        next if $ctime - $oldest > 5; # ignore newer files
-
-        my $path = $mod;
-        $mod =~ s{[.]pm\z}{};
-        $mod =~ s{\A$libdir}{};
-        $mod =~ s{/}{::}g;
-
-        my $ver = Common::evalver($path) || q{};
-        push @mods, [ $mod, $ver ];
-    }
-
-    # Convert modules names to the dist names who provide them.
-    my %seen;
-    my @dists;
-    for my $modref (@mods) {
-        my ($mod, $ver) = @$modref;
-        my $dist = cpan_provider($mod) or next; # filter out core modules
-        next if $seen{$dist}++;                 # avoid duplicate dists
-        push @dists, [ $dist, $ver ];
-    }
-    return @dists;
-}
-
-#-----------------------------------------------------------------------------
-
-package Dist2Pkg;
-
-sub name
-{
-    my ($name) = @_;
-    my $orig = $name;
-
-    # Package names should be lowercase and consist of alphanumeric
-    # characters only (and hyphens!)...
-    $name =~ tr/A-Z/a-z/;
-    $name =~ tr/_+/-/; # _ and +'s converted to - (ie Tabbed-Text+Wrap)
-    $name =~ tr/-a-z0-9+//cd; # Delete all other chars.
-    $name =~ tr/-/-/s;
-
-    # Delete leading or trailing hyphens...
-    $name =~ s/\A-|-\z//g;
-
-    die qq{Dist. name '$orig' completely violates packaging standards}
-        unless $name;
-
-    return "perl-$name";
-}
-
-sub version
-{
-    my ($version) = @_;
-
-    # Package versions should be numbers and decimal points only...
-    $version =~ tr/-/./;
-    $version =~ tr/_0-9.-//cd;
-
-    # Remove developer versions because pacman has no special logic
-    # to compare them to regular versions like perl does.
-    $version =~ s/_[^_]+\z//;
-
-    $version =~ tr/_//d;  # delete other underscores
-    $version =~ tr/././s; # only one period at a time
-    $version =~ s/\A[.]|[.]\z//g; # shouldn't start or stop with a period
-
-    return $version;
-}
-
-#-----------------------------------------------------------------------------
-
-package main;
-
-my %CPANNAME = ('List-Util' => 'Scalar-List-Utils',
-                'Text-Tabs' => 'Text-Tabs+Wrap',
-                'Cwd'       => 'PathTools');
-
-my $perldir = shift or die "Usage: $0 [path to perl source directory]\n";
-die "$perldir is not a valid directory." unless -d $perldir;
-
-my @dists = (Dists::find($perldir), Modules::find($perldir));
-for my $dist (@dists) {
-    my $name = $dist->[0];
-    $dist->[0] = $CPANNAME{$name} if exists $CPANNAME{$name};
-}
-
-my @pkgs = map {
-    my ($name, $ver) = @$_;
-    $name = Dist2Pkg::name($name);
-    $ver  = Dist2Pkg::version($ver);
-    [ $name, $ver ];
-} @dists;
-
-@pkgs = sort { $a->[0] cmp $b->[0] } @pkgs;
-
-for my $pkg (@pkgs) {
-    my ($name, $ver) = @$pkg;
-    print "$name=$ver\n";
-}
diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD
deleted file mode 100644
index 67e323089..000000000
--- a/testing/php/PKGBUILD
+++ /dev/null
@@ -1,363 +0,0 @@
-# $Id: PKGBUILD 139147 2011-09-30 09:12:23Z eric $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=php
-pkgname=('php'
-         'php-cgi'
-         'php-apache'
-         'php-fpm'
-         'php-embed'
-         'php-pear'
-         'php-enchant'
-         'php-gd'
-         'php-intl'
-         'php-ldap'
-         'php-mcrypt'
-         'php-mssql'
-         'php-odbc'
-         'php-pgsql'
-         'php-pspell'
-         'php-snmp'
-         'php-sqlite'
-         'php-tidy'
-         'php-xsl')
-pkgver=5.3.8
-_suhosinver=5.3.7-0.9.10
-pkgrel=4
-arch=('i686' 'x86_64')
-license=('PHP')
-url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
-             'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
-             'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
-             'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
-source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
-        "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
-        'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
-        'logrotate.d.php-fpm')
-md5sums=('704cd414a0565d905e1074ffdc1fadfb'
-         '08582e502fed8221c6577042ca45ddb8'
-         '65606c606df97a0760dfe5aaf9893afc'
-         'dec2cbaad64e3abf4f0ec70e1de4e8e9'
-         'b01be5f816988fcee7e78225836e5e27'
-         '09005dabd90c48ddd392b3dbf05f8a82'
-         '07c4e412909ac65a44ec90e7a2c4bade')
-
-build() {
-	phpconfig="--srcdir=../${pkgbase}-${pkgver} \
-		--prefix=/usr \
-		--sysconfdir=/etc/php \
-		--localstatedir=/var \
-		--with-layout=GNU \
-		--with-config-file-path=/etc/php \
-		--with-config-file-scan-dir=/etc/php/conf.d \
-		--enable-inline-optimization \
-		--disable-debug \
-		--disable-rpath \
-		--disable-static \
-		--enable-shared \
-		--mandir=/usr/share/man \
-		--without-pear \
-		"
-
-	phpextensions="--enable-bcmath=shared \
-		--enable-calendar=shared \
-		--enable-dba=shared \
-		--enable-exif=shared \
-		--enable-ftp=shared \
-		--enable-gd-native-ttf \
-		--enable-intl=shared \
-		--enable-json=shared \
-		--enable-mbregex \
-		--enable-mbstring \
-		--enable-pdo \
-		--enable-phar=shared \
-		--enable-posix=shared \
-		--enable-session \
-		--enable-shmop=shared \
-		--enable-soap=shared \
-		--enable-sockets=shared \
-		--enable-sqlite-utf8 \
-		--enable-sysvmsg=shared \
-		--enable-sysvsem=shared \
-		--enable-sysvshm=shared \
-		--enable-xml \
-		--enable-zip=shared \
-		--with-bz2=shared \
-		--with-curl=shared \
-		--with-db4=/usr \
-		--with-enchant=shared,/usr \
-		--with-freetype-dir=shared,/usr \
-		--with-gd=shared \
-		--with-gdbm=shared \
-		--with-gettext=shared \
-		--with-gmp=shared \
-		--with-iconv=shared \
-		--with-icu-dir=/usr \
-		--with-imap-ssl=shared \
-		--with-imap=shared \
-		--with-jpeg-dir=shared,/usr \
-		--with-ldap=shared \
-		--with-ldap-sasl \
-		--with-mcrypt=shared \
-		--with-mhash \
-		--with-mssql=shared \
-		--with-mysql-sock=/var/run/mysqld/mysqld.sock \
-		--with-mysql=shared,mysqlnd \
-		--with-mysqli=shared,mysqlnd \
-		--with-openssl=shared \
-		--with-pcre-regex=/usr \
-		--with-pdo-mysql=shared,mysqlnd \
-		--with-pdo-odbc=shared,unixODBC,/usr \
-		--with-pdo-pgsql=shared \
-		--with-pdo-sqlite=shared,/usr \
-		--with-pgsql=shared \
-		--with-png-dir=shared,/usr \
-		--with-pspell=shared \
-		--with-regex=php \
-		--with-snmp=shared \
-		--with-sqlite3=shared,/usr \
-		--with-sqlite=shared \
-		--with-tidy=shared \
-		--with-unixODBC=shared,/usr \
-		--with-xmlrpc=shared \
-		--with-xsl=shared \
-		--with-zlib \
-		--without-db2 \
-		--without-db3 \
-		"
-
-	EXTENSION_DIR=/usr/lib/php/modules
-	export EXTENSION_DIR
-	PEAR_INSTALLDIR=/usr/share/pear
-	export PEAR_INSTALLDIR
-
-	cd ${srcdir}/${pkgbase}-${pkgver}
-
-	# apply suhosin patch
-	patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
-
-	# adjust paths
-	patch -p0 -i ${srcdir}/php.ini.patch
-	patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
-
-	# php
-	mkdir ${srcdir}/build-php
-	cd ${srcdir}/build-php
-	ln -s ../${pkgbase}-${pkgver}/configure
-	./configure ${phpconfig} \
-		--disable-cgi \
-		--with-readline \
-		--enable-pcntl \
-		${phpextensions}
-	make
-
-	# cgi and fcgi
-	# reuse the previous run; this will save us a lot of time
-	cp -a ${srcdir}/build-php ${srcdir}/build-cgi
-	cd ${srcdir}/build-cgi
-	./configure ${phpconfig} \
-		--disable-cli \
-		--enable-cgi \
-		${phpextensions}
-	make
-
-	# apache
-	cp -a ${srcdir}/build-php ${srcdir}/build-apache
-	cd ${srcdir}/build-apache
-	./configure ${phpconfig} \
-		--disable-cli \
-		--with-apxs2 \
-		${phpextensions}
-	make
-
-	# fpm
-	cp -a ${srcdir}/build-php ${srcdir}/build-fpm
-	cd ${srcdir}/build-fpm
-	./configure ${phpconfig} \
-		--disable-cli \
-		--enable-fpm \
-		--with-fpm-user=http \
-		--with-fpm-group=http \
-		${phpextensions}
-	make
-
-	# embed
-	cp -a ${srcdir}/build-php ${srcdir}/build-embed
-	cd ${srcdir}/build-embed
-	./configure ${phpconfig} \
-		--disable-cli \
-		--enable-embed=shared \
-		${phpextensions}
-	make
-
-	# pear
-	cp -a ${srcdir}/build-php ${srcdir}/build-pear
-	cd ${srcdir}/build-pear
-	./configure ${phpconfig} \
-		--disable-cgi \
-		--with-readline \
-		--enable-pcntl \
-		--with-pear \
-		${phpextensions}
-	make
-}
-
-# check() {
-# 	cd ${srcdir}/build-php
-# 	make test
-# }
-
-package_php() {
-	pkgdesc='An HTML-embedded scripting language'
-	depends=('pcre' 'libxml2' 'bzip2' 'curl')
-	replaces=('php-fileinfo' 'php-gmp' 'php-curl')
-	provides=('php-fileinfo' 'php-gmp' 'php-curl')
-	conflicts=('php-fileinfo' 'php-gmp' 'php-curl')
-	backup=('etc/php/php.ini')
-
-	cd ${srcdir}/build-php
-	make -j1 INSTALL_ROOT=${pkgdir} install
-	install -d -m755 ${pkgdir}/usr/share/pear
-	# install php.ini
-	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini
-	install -d -m755 ${pkgdir}/etc/php/conf.d/
-
-	# remove static modules
-	rm -f ${pkgdir}/usr/lib/php/modules/*.a
-	# remove modules provided by sub packages
-	rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
-	# remove empty directory
-	rmdir ${pkgdir}/usr/include/php/include
-}
-
-package_php-cgi() {
-	pkgdesc='CGI and FCGI SAPI for PHP'
-	depends=('php')
-
-	install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi
-}
-
-package_php-apache() {
-	pkgdesc='Apache SAPI for PHP'
-	depends=('php' 'apache')
-	backup=('etc/httpd/conf/extra/php5_module.conf')
-
-	install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so
-	install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf
-}
-
-package_php-fpm() {
-	pkgdesc='FastCGI Process Manager for PHP'
-	depends=('php')
-	backup=('etc/php/php-fpm.conf')
-
-	install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm
-	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8
-	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf
-	install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm
-	install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm
-	install -d -m755 ${pkgdir}/etc/php/fpm.d
-}
-
-package_php-embed() {
-	pkgdesc='Embed SAPI for PHP'
-	depends=('php')
-
-	install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so
-	install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h
-}
-
-package_php-pear() {
-	pkgdesc='PHP Extension and Application Repository'
-	depends=('php')
-	backup=('etc/php/pear.conf')
-
-	cd ${srcdir}/build-pear
-	make -j1 install-pear INSTALL_ROOT=${pkgdir}
-	local i
-	while read i; do
-		[ ! -e "$i" ] || rm -rf "$i"
-	done < <(find ${pkgdir} -name '.*')
-}
-
-package_php-enchant() {
-	depends=('php' 'enchant')
-	pkgdesc='enchant module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so
-}
-
-package_php-gd() {
-	depends=('php' 'libpng' 'libjpeg' 'freetype2')
-	pkgdesc='gd module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
-}
-
-package_php-intl() {
-	depends=('php' 'icu')
-	pkgdesc='intl module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so
-}
-
-package_php-ldap() {
-	depends=('php' 'libldap')
-	pkgdesc='ldap module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so
-}
-
-package_php-mcrypt() {
-	depends=('php' 'libmcrypt' 'libltdl')
-	pkgdesc='mcrypt module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so
-}
-
-package_php-mssql() {
-	depends=('php' 'freetds')
-	pkgdesc='mssql module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so
-}
-
-package_php-odbc() {
-	depends=('php' 'unixodbc')
-	pkgdesc='ODBC modules for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so
-	install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so
-}
-
-package_php-pgsql() {
-	depends=('php' 'postgresql-libs')
-	pkgdesc='PostgreSQL modules for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so
-	install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so
-}
-
-package_php-pspell() {
-	depends=('php' 'aspell')
-	pkgdesc='pspell module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so
-}
-
-package_php-snmp() {
-	depends=('php' 'net-snmp')
-	pkgdesc='snmp module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so
-}
-
-package_php-sqlite() {
-	depends=('php' 'sqlite3')
-	pkgdesc='sqlite3 module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so
-	install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so
-}
-
-package_php-tidy() {
-	depends=('php' 'tidyhtml')
-	pkgdesc='tidy module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so
-}
-
-package_php-xsl() {
-	depends=('php' 'libxslt')
-	pkgdesc='xsl module for PHP'
-	install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so
-}
diff --git a/testing/php/apache.conf b/testing/php/apache.conf
deleted file mode 100644
index c3ca0aad5..000000000
--- a/testing/php/apache.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Required modules: dir_module, php5_module
-
-<IfModule dir_module>
-	<IfModule php5_module>
-		DirectoryIndex index.php index.html
-		<FilesMatch "\.php$">
-			SetHandler application/x-httpd-php
-		</FilesMatch>
-		<FilesMatch "\.phps$">
-			SetHandler application/x-httpd-php-source
-		</FilesMatch>
-	</IfModule>
-</IfModule>
diff --git a/testing/php/logrotate.d.php-fpm b/testing/php/logrotate.d.php-fpm
deleted file mode 100644
index 7a1ba2597..000000000
--- a/testing/php/logrotate.d.php-fpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/php-fpm.log {
-	missingok
-	postrotate
-	/etc/rc.d/php-fpm logrotate >/dev/null || true
-	endscript
-}
diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch
deleted file mode 100644
index b4dd32f96..000000000
--- a/testing/php/php-fpm.conf.in.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- sapi/fpm/php-fpm.conf.in	2011-07-04 23:22:56.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2011-08-12 16:56:23.686606725 +0200
-@@ -12,7 +12,7 @@
- ; Relative path can also be used. They will be prefixed by:
- ;  - the global prefix if it's been set (-p arguement)
- ;  - @prefix@ otherwise
--;include=etc/fpm.d/*.conf
-+;include=/etc/php/fpm.d/*.conf
- 
- ;;;;;;;;;;;;;;;;;;
- ; Global Options ;
-@@ -22,7 +22,7 @@
- ; Pid file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
- ; Default Value: none
--;pid = run/php-fpm.pid
-+pid = run/php-fpm/php-fpm.pid
- 
- ; Error log file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
-@@ -102,7 +102,8 @@
- ;                            specific port;
- ;   '/path/to/unix/socket' - to listen on a unix socket.
- ; Note: This value is mandatory.
--listen = 127.0.0.1:9000
-+;listen = 127.0.0.1:9000
-+listen = /var/run/php-fpm/php-fpm.sock
- 
- ; Set listen(2) backlog. A value of '-1' means unlimited.
- ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -121,9 +122,9 @@
- ; BSD-derived systems allow connections regardless of permissions. 
- ; Default Values: user and group are set as the running user
- ;                 mode is set to 0666
--;listen.owner = @php_fpm_user@
--;listen.group = @php_fpm_group@
--;listen.mode = 0666
-+listen.owner = @php_fpm_user@
-+listen.group = @php_fpm_group@
-+listen.mode = 0660
- 
- ; Unix user/group of processes
- ; Note: The user is mandatory. If the group is not set, the default user's group
-@@ -163,23 +164,23 @@
- ; The number of child processes created on startup.
- ; Note: Used only when pm is set to 'dynamic'
- ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
--;pm.start_servers = 20
-+pm.start_servers = 20
- 
- ; The desired minimum number of idle server processes.
- ; Note: Used only when pm is set to 'dynamic'
- ; Note: Mandatory when pm is set to 'dynamic'
--;pm.min_spare_servers = 5
-+pm.min_spare_servers = 5
- 
- ; The desired maximum number of idle server processes.
- ; Note: Used only when pm is set to 'dynamic'
- ; Note: Mandatory when pm is set to 'dynamic'
--;pm.max_spare_servers = 35
-+pm.max_spare_servers = 35
-  
- ; The number of requests each child process should execute before respawning.
- ; This can be useful to work around memory leaks in 3rd party libraries. For
- ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
- ; Default Value: 0
--;pm.max_requests = 500
-+pm.max_requests = 500
- 
- ; The URI to view the FPM status page. If this value is not set, no URI will be
- ; recognized as a status page. By default, the status page shows the following
-@@ -333,7 +334,7 @@
- ; Chdir to this directory at the start.
- ; Note: relative path can be used.
- ; Default Value: current directory or / when chroot
--;chdir = /var/www
-+;chdir = /srv/http
-  
- ; Redirect worker stdout and stderr into main error log. If not set, stdout and
- ; stderr will be redirected to /dev/null according to FastCGI specs.
diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch
deleted file mode 100644
index 46c842921..000000000
--- a/testing/php/php.ini.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- php.ini-production	2011-02-09 01:25:44.000000000 +0100
-+++ php.ini-production	2011-03-19 11:11:44.496987763 +0100
-@@ -376,7 +376,7 @@
- ; or per-virtualhost web server configuration file. This directive is
- ; *NOT* affected by whether Safe Mode is turned On or Off.
- ; http://php.net/open-basedir
--;open_basedir =
-+open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/
- 
- ; This directive allows you to disable certain functions for security reasons.
- ; It receives a comma-delimited list of function names. This directive is
-@@ -781,7 +781,7 @@
- ;;;;;;;;;;;;;;;;;;;;;;;;;
- 
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
-@@ -804,7 +804,7 @@
- 
- ; Directory in which the loadable extensions (modules) reside.
- ; http://php.net/extension-dir
--; extension_dir = "./"
-+extension_dir = "/usr/lib/php/modules/"
- ; On windows:
- ; extension_dir = "ext"
- 
-@@ -938,53 +938,49 @@
- ; If you only provide the name of the extension, PHP will look for it in its
- ; default extension directory.
- ;
--; Windows Extensions
--; Note that ODBC support is built in, so no dll is needed for it.
--; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
--; extension folders as well as the separate PECL DLL download (PHP 5).
--; Be sure to appropriately set the extension_dir directive.
--;
--;extension=php_bz2.dll
--;extension=php_curl.dll
--;extension=php_fileinfo.dll
--;extension=php_gd2.dll
--;extension=php_gettext.dll
--;extension=php_gmp.dll
--;extension=php_intl.dll
--;extension=php_imap.dll
--;extension=php_interbase.dll
--;extension=php_ldap.dll
--;extension=php_mbstring.dll
--;extension=php_exif.dll      ; Must be after mbstring as it depends on it
--;extension=php_mysql.dll
--;extension=php_mysqli.dll
--;extension=php_oci8.dll      ; Use with Oracle 10gR2 Instant Client
--;extension=php_oci8_11g.dll  ; Use with Oracle 11g Instant Client
--;extension=php_openssl.dll
--;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
--;extension=php_pdo_mysql.dll
--;extension=php_pdo_oci.dll
--;extension=php_pdo_odbc.dll
--;extension=php_pdo_pgsql.dll
--;extension=php_pdo_sqlite.dll
--;extension=php_pgsql.dll
--;extension=php_pspell.dll
--;extension=php_shmop.dll
--
--; The MIBS data available in the PHP distribution must be installed. 
--; See http://www.php.net/manual/en/snmp.installation.php 
--;extension=php_snmp.dll
--
--;extension=php_soap.dll
--;extension=php_sockets.dll
--;extension=php_sqlite.dll
--;extension=php_sqlite3.dll
--;extension=php_sybase_ct.dll
--;extension=php_tidy.dll
--;extension=php_xmlrpc.dll
--;extension=php_xsl.dll
--;extension=php_zip.dll
-+;extension=bcmath.so
-+;extension=bz2.so
-+;extension=calendar.so
-+extension=curl.so
-+;extension=dba.so
-+;extension=enchant.so
-+;extension=exif.so
-+;extension=ftp.so
-+;extension=gd.so
-+extension=gettext.so
-+;extension=gmp.so
-+;extension=iconv.so
-+;extension=imap.so
-+;extension=intl.so
-+extension=json.so
-+;extension=ldap.so
-+;extension=mcrypt.so
-+;extension=mssql.so
-+;extension=mysqli.so
-+;extension=mysql.so
-+;extension=odbc.so
-+;extension=openssl.so
-+;extension=pdo_mysql.so
-+;extension=pdo_odbc.so
-+;extension=pdo_pgsql.so
-+;extension=pdo_sqlite.so
-+;extension=pgsql.so
-+;extension=phar.so
-+;extension=posix.so
-+;extension=pspell.so
-+;extension=shmop.so
-+;extension=snmp.so
-+;extension=soap.so
-+;extension=sockets.so
-+;extension=sqlite3.so
-+;extension=sqlite.so
-+;extension=sysvmsg.so
-+;extension=sysvsem.so
-+;extension=sysvshm.so
-+;extension=tidy.so
-+;extension=xmlrpc.so
-+;extension=xsl.so
-+;extension=zip.so
- 
- ;;;;;;;;;;;;;;;;;;;
- ; Module Settings ;
diff --git a/testing/php/rc.d.php-fpm b/testing/php/rc.d.php-fpm
deleted file mode 100644
index 54bcf4d5b..000000000
--- a/testing/php/rc.d.php-fpm
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-wait_for_pid () {
-	try=0
-	while test $try -lt 35 ; do
-		case "$1" in
-			'created')
-			if [ -f "$2" ] ; then
-				try=''
-				break
-			fi
-			;;
-			'removed')
-			if [ ! -f "$2" ] ; then
-				try=''
-				break
-			fi
-			;;
-		esac
-
-		stat_append '.'
-		try=`expr $try + 1`
-		sleep 1
-	done
-}
-
-test_config() {
-	stat_busy 'Checking configuration'
-	if [ $(id -u) -ne 0 ]; then
-		stat_append '(This script must be run as root)'
-		stat_die
-	fi
-
-	if [ ! -r /etc/php/php-fpm.conf ]; then
-		stat_append '(/etc/php/php-fpm.conf not found)'
-		stat_die
-	fi
-
-	local test=$(/usr/sbin/php-fpm -t 2>&1)
-	if [ $? -gt 0 ]; then
-		stat_append '(error in /etc/php/php-fpm.conf)'
-		stat_die
-	elif echo $test | grep -qi 'error'; then
-		stat_append '(error in /etc/php/php.ini)'
-		stat_die
-	fi
-
-	[ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm
-
-	stat_done
-}
-
-case "$1" in
-	start)
-		test_config
-		stat_busy 'Starting php-fpm'
-
-		/usr/sbin/php-fpm
-
-		if [ "$?" != 0 ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		wait_for_pid created /var/run/php-fpm/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			add_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	stop)
-		test_config
-		stat_busy 'Gracefully shutting down php-fpm'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -QUIT `cat /var/run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /var/run/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			rm_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	force-quit)
-		stat_busy 'Terminating php-fpm'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -TERM `cat /var/run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /var/run/php-fpm/php-fpm.pid
-
-		if [ -n "$try" ] ; then
-			stat_fail
-			exit 1
-		else
-			rm_daemon php-fpm
-			stat_done
-		fi
-	;;
-
-	restart)
-		$0 stop
-		$0 start
-	;;
-
-	reload)
-		test_config
-		stat_busy 'Reload service php-fpm'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -USR2 `cat /var/run/php-fpm/php-fpm.pid`
-		stat_done
-	;;
-
-	logrotate)
-		stat_busy 'Reopen php-fpm log'
-
-		if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -USR1 `cat /var/run/php-fpm/php-fpm.pid`
-		stat_done
-	;;
-
-	*)
-		echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}"
-		exit 1
-	;;
-
-esac
diff --git a/testing/polkit-gnome/PKGBUILD b/testing/polkit-gnome/PKGBUILD
deleted file mode 100644
index fe3b7eb3f..000000000
--- a/testing/polkit-gnome/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 139037 2011-09-28 19:32:57Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: onestep_ua <onestep@ukr.net>
-
-pkgname=polkit-gnome
-pkgver=0.103
-pkgrel=1
-pkgdesc="PolicyKit integration for the GNOME desktop"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/PolicyKit"
-license=('LGPL')
-depends=('polkit' 'gtk3')
-makedepends=('intltool' 'gobject-introspection')
-options=(!libtool)
-source=(http://download.gnome.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz
-        polkit-gnome-authentication-agent-1.desktop)
-sha256sums=('e12712010c76dd7031f83d932253c53940821f5e47303b02fd70d66062ce396b'
-            'ad19e73ae8eba00a8f66bd9afd3e0e1fd7ca22f716e29b97f097d9c01711e0de')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/polkit-gnome \
-      --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 "${srcdir}/polkit-gnome-authentication-agent-1.desktop" \
-      "${pkgdir}/etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop"
-}
diff --git a/testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
deleted file mode 100644
index fc2acc28d..000000000
--- a/testing/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
+++ /dev/null
@@ -1,88 +0,0 @@
-[Desktop Entry]
-Name=PolicyKit Authentication Agent
-Name[ar]=مدير الاستيثاق PolicyKit
-Name[be]=PolicyKit - аґент аўтэнтыфікацыі
-Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
-Name[ca]=Agent d'autenticació del PolicyKit
-Name[cs]=Ověřovací agent PolicyKit
-Name[da]=Godkendelsesprogrammet PolicyKit
-Name[de]=Legitimationsdienst von PolicyKit
-Name[el]=Πράκτορας πιστοποίησης PolicyKit
-Name[en_GB]=PolicyKit Authentication Agent
-Name[es]=Agente de autenticación de PolicyKit
-Name[eu]=PolicyKit autentifikatzeko agentea
-Name[fi]=PolicytKit-tunnistautumisohjelma
-Name[fr]=Agent d'authentification de PolicyKit
-Name[gl]=Axente de autenticación PolicyKit
-Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
-Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
-Name[hu]=PolicyKit hitelesítési ügynök
-Name[it]=Agente di autenticazione per PolicyKit
-Name[ja]=PolicyKit 認証エージェント
-Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
-Name[lt]=PolicyKit tapatybės nustatymo agentas
-Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
-Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट
-Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
-Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
-Name[pl]=Agent uwierzytelniania PolicyKit
-Name[pt]=Agente de Autenticação PolicyKit
-Name[pt_BR]=Agente de autenticação PolicyKit
-Name[ro]=Agent de autentificare PolicyKit
-Name[sk]=Agent PolicyKit na overovanie totožnosti
-Name[sl]=PolicyKit program overjanja
-Name[sv]=Autentiseringsagent för PolicyKit
-Name[ta]=PolicyKit அங்கீகார முகவர்
-Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
-Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
-Name[uk]=Агент автентифікації PolicyKit
-Name[zh_CN]=PolicyKit 认证代理
-Name[zh_HK]=PolicyKit 驗證代理程式
-Name[zh_TW]=PolicyKit 驗證代理程式
-Comment=PolicyKit Authentication Agent
-Comment[ar]=مدير الاستيثاق PolicyKit
-Comment[be]=PolicyKit - аґент аўтэнтыфікацыі
-Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
-Comment[ca]=Agent d'autenticació del PolicyKit
-Comment[cs]=Ověřovací agent PolicyKit
-Comment[da]=Godkendelsesprogrammet PolicyKit
-Comment[de]=Legitimationsdienst von PolicyKit
-Comment[el]=Πράκτορας πιστοποίησης PolicyKit
-Comment[en_GB]=PolicyKit Authentication Agent
-Comment[es]=Agente de autenticación de PolicyKit
-Comment[eu]=PolicyKit autentifikatzeko agentea
-Comment[fi]=PolicytKit-tunnistautumisohjelma
-Comment[fr]=Agent d'authentification de PolicyKit
-Comment[gl]=Axente de autenticación PolicyKit
-Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
-Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
-Comment[hu]=PolicyKit hitelesítési ügynök
-Comment[it]=Agente di autenticazione per PolicyKit
-Comment[ja]=PolicyKit 認証エージェント
-Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
-Comment[lt]=PolicyKit tapatybės nustatymo agentas
-Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
-Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट
-Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
-Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
-Comment[pl]=Agent uwierzytelniania PolicyKit
-Comment[pt]=Agente de Autenticação PolicyKit
-Comment[pt_BR]=Agente de autenticação PolicyKit
-Comment[ro]=Agent de autentificare PolicyKit
-Comment[sk]=Agent PolicyKit na overovanie totožnosti
-Comment[sl]=PolicyKit program overjanja
-Comment[sv]=Autentiseringsagent för PolicyKit
-Comment[ta]=PolicyKit அங்கீகார முகவர்
-Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
-Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
-Comment[uk]=Агент автентифікації PolicyKit
-Comment[zh_CN]=PolicyKit 认证代理
-Comment[zh_HK]=PolicyKit 驗證代理程式
-Comment[zh_TW]=PolicyKit 驗證代理程式
-Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-Terminal=false
-Type=Application
-Categories=
-NoDisplay=true
-NotShowIn=KDE;
-AutostartCondition=GNOME3 unless-session gnome
diff --git a/testing/postgresql-old-upgrade/PKGBUILD b/testing/postgresql-old-upgrade/PKGBUILD
deleted file mode 100644
index 7ea45880c..000000000
--- a/testing/postgresql-old-upgrade/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 138522 2011-09-26 20:47:05Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgname=postgresql-old-upgrade
-pkgver=9.0.5
-_majorver=${pkgver%.*}
-pkgrel=1
-pkgdesc="Minimal PostgreSQL build for migrating between major versions with pg_upgrade"
-arch=('i686' 'x86_64')
-url="http://www.postgresql.org/"
-license=('custom:PostgreSQL')
-depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0')
-source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
-
-build() {
-  cd "${srcdir}/postgresql-${pkgver}"
-
-  ./configure --prefix=/opt/pgsql-${_majorver} \
-  --with-libxml --with-openssl --without-perl \
-  --without-python --with-pam --without-readline \
-  --with-system-tzdata=/usr/share/zoneinfo --disable-nls \
-  --enable-thread-safety
-
-  make -C src all
-}
-
-package() {
-  cd "${srcdir}/postgresql-${pkgver}"
-
-  # install
-  make DESTDIR="${pkgdir}" -C src install
-
-  # install license
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  # clean up unneeded installed items
-  rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/"
-}
-
-md5sums=('86816eb8a8513532957b96045abdfef9')
-sha256sums=('56d8ee809ceeabeae8461ae0a197943460cba5bf8fbe37324e4451cf2eb7d504')
diff --git a/testing/postgresql/PKGBUILD b/testing/postgresql/PKGBUILD
deleted file mode 100644
index 0cd417ade..000000000
--- a/testing/postgresql/PKGBUILD
+++ /dev/null
@@ -1,138 +0,0 @@
-# $Id: PKGBUILD 138528 2011-09-26 22:48:37Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgbase=postgresql
-pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=9.1.1
-_majorver=${pkgver%.*}
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.postgresql.org/"
-license=('custom:PostgreSQL')
-makedepends=('libxml2' 'python2' 'perl' 'openssl>=1.0.0')
-source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
-        postgresql postgresql.confd postgresql.pam postgresql.logrotate)
-
-build() {
-  cd "${srcdir}/postgresql-${pkgver}"
-
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-  --datadir=/usr/share/postgresql \
-  --with-libxml --with-openssl --with-perl \
-  --with-python PYTHON=/usr/bin/python2 --with-pam \
-  --with-system-tzdata=/usr/share/zoneinfo --enable-nls \
-  --enable-thread-safety
-
-  make world
-}
-
-package_postgresql-libs() {
-  pkgdesc="Libraries for use with PostgreSQL"
-  depends=('openssl>=1.0.0' 'readline>=6.0')
-  provides=('postgresql-client')
-  conflicts=('postgresql-client')
-
-  cd "${srcdir}/postgresql-${pkgver}"
-
-  # install license
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE"
-
-  # install libs
-  for dir in src/interfaces src/bin/pg_config src/bin/psql; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
-
-  install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1"
-  install -D -m644 doc/src/sgml/man1/psql.1 "${pkgdir}/usr/share/man/man1/psql.1"
-
-  cd src/include
-
-  mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq}
-
-  # these headers are needed by the public headers of the interfaces
-  install -m644 pg_config.h "${pkgdir}/usr/include/"
-  install -m644 pg_config_os.h "${pkgdir}/usr/include/"
-  install -m644 postgres_ext.h "${pkgdir}/usr/include/"
-  install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/"
-  install -m644 pg_config_manual.h "${pkgdir}/usr/include/"
-
-  # these headers are needed by the not-so-public headers of the interfaces
-  install -m644 c.h "${pkgdir}/usr/include/postgresql/internal/"
-  install -m644 port.h "${pkgdir}/usr/include/postgresql/internal/"
-  install -m644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/"
-  install -m644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/"
-}
-
-package_postgresql-docs() {
-  pkgdesc="HTML documentation for PostgreSQL"
-  options=(docs)
-
-  cd "${srcdir}/postgresql-${pkgver}"
-
-  # install license
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-docs/LICENSE"
-
-  make -C doc/src/sgml DESTDIR="${pkgdir}" install-html
-  chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html/"
-
-  # clean up
-  rmdir "${pkgdir}"/usr/share/man/man{1,3,7}
-  rmdir "${pkgdir}"/usr/share/man
-}
-
-package_postgresql() {
-  pkgdesc="A sophisticated object-relational DBMS"
-  backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql')
-  depends=("postgresql-libs>=${pkgver}" 'libxml2' 'readline>=6.0' 'openssl>=1.0.0')
-  optdepends=('python2: for PL/Python support'
-              'perl: for PL/Perl support'
-              'postgresql-old-upgrade: upgrade from previous major version using pg_upgrade')
-  install=postgresql.install
-
-  cd "${srcdir}/postgresql-${pkgver}"
-
-  # install
-  make DESTDIR="${pkgdir}" install
-  make -C contrib DESTDIR="${pkgdir}" install
-  make -C doc/src/sgml DESTDIR="${pkgdir}" install-man
-
-  # we don't want these, they are in the -libs package
-  for dir in src/interfaces src/bin/pg_config src/bin/psql; do
-    make -C ${dir} DESTDIR="${pkgdir}" uninstall
-  done
-  rm "${pkgdir}/usr/share/man/man1/pg_config.1"
-  rm "${pkgdir}/usr/share/man/man1/psql.1"
-
-  # install license
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
-
-  # clean up unneeded installed items
-  rm -rf "${pkgdir}/usr/include/postgresql/internal"
-  rm -rf "${pkgdir}/usr/include/libpq"
-  find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} +
-  rmdir "${pkgdir}/usr/share/doc/postgresql/html"
-
-  # install launch script
-  install -D -m755 "${srcdir}/postgresql" "${pkgdir}/etc/rc.d/postgresql"
-
-  # install conf file
-  install -D -m644 ${srcdir}/postgresql.confd \
-    "${pkgdir}/etc/conf.d/postgresql"
-
-  install -D -m644 ${srcdir}/postgresql.pam \
-    "${pkgdir}/etc/pam.d/postgresql"
-
-  install -D -m644 ${srcdir}/postgresql.logrotate \
-    "${pkgdir}/etc/logrotate.d/postgresql"
-}
-
-md5sums=('061a9f17323117c9358ed60f33ecff78'
-         '4a6e9b63f2aa50195735f2b46aba040b'
-         '2bef962971bac882022c41a72efabb96'
-         '96f82c38f3f540b53f3e5144900acf17'
-         'd28e443f9f65a5712c52018b84e27137')
-sha256sums=('c794016bcf3fc1f561bc86796c6c9d050e3d8d2d55356515126e048275ae56f2'
-            'b2931d7a719e765f14811b9109310b2418d3064bfcedef699573fc25854a2201'
-            '92fe999c34824a9b8fe4b7212d58f60247e3d0514dd38807758eac64c4198190'
-            '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
-            '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e')
diff --git a/testing/postgresql/postgresql b/testing/postgresql/postgresql
deleted file mode 100755
index 2ff845f73..000000000
--- a/testing/postgresql/postgresql
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/postgresql
-
-# Default PGROOT if it wasn't defined in the conf.d file
-PGROOT=${PGROOT:-/var/lib/postgres}
-PGLOG=${PGLOG:-/var/log/postgresql.log}
-PGCTL_BIN=/usr/bin/pg_ctl
-PGCTL_ARGS=(-D "$PGROOT/data" -l "$PGLOG" -s -w)
-[[ $PGOPTS ]] && PGCTL_ARGS+=(-o "$PGOPTS")
-
-postgres_init() {
-    # initialization
-    if [[ ! -d "$PGROOT/data" ]]; then
-        mkdir -p "$PGROOT/data" && chown -R postgres:postgres "$PGROOT"
-        su - postgres -c "/usr/bin/initdb $INITOPTS -D '$PGROOT/data'"
-    fi
-    if [[ ! -e "$PGLOG" ]]; then
-        touch "$PGLOG"
-        chown postgres "$PGLOG"
-    fi
-}
-
-do_postgres() {
-  su - postgres -c "'$PGCTL_BIN' $(printf '%q ' "${PGCTL_ARGS[@]}") $@"
-}
-
-case $1 in
-  start)
-    postgres_init
-    stat_busy "Starting PostgreSQL"
-    if do_postgres start; then
-      add_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PostgreSQL"
-    if do_postgres stop -m fast; then
-      rm_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  reload)
-    stat_busy "Reloading PostgreSQL"
-    if do_postgres reload; then
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    postgres_init
-    stat_busy "Restarting PostgreSQL"
-    if do_postgres restart -m fast; then
-      add_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  status)
-    stat_busy "Checking PostgreSQL status";
-    ck_status postgresql
-    ;;
-  *)
-    echo "usage: $0 {start|stop|reload|restart|status}"
-    exit 1
-esac
diff --git a/testing/postgresql/postgresql.confd b/testing/postgresql/postgresql.confd
deleted file mode 100644
index 2d68f2772..000000000
--- a/testing/postgresql/postgresql.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-##
-## Parameters to be passed to postgresql
-##
-## Default data directory location
-#PGROOT="/var/lib/postgres"
-## Passed to initdb if necessary
-#INITOPTS="--locale $LANG"
-## Default log file location
-#PGLOG="/var/log/postgresql.log"
-## Additional options to pass via pg_ctl's '-o' option
-#PGOPTS=""
diff --git a/testing/postgresql/postgresql.install b/testing/postgresql/postgresql.install
deleted file mode 100644
index c52432271..000000000
--- a/testing/postgresql/postgresql.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-  if [ ! -d '/var/lib/postgres' ]; then
-    mkdir -p '/var/lib/postgres'
-  fi
-  getent group postgres >/dev/null || groupadd -g 88 postgres
-  getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres
-  passwd -l postgres >/dev/null
-}
-
-post_upgrade() {
-  post_install $1
-  # FS#23858, fix postgres user shell issue
-  postgres_shell=$(getent passwd postgres | cut -d: -f7)
-  if [ "$postgres_shell" = "/sbin/nologin" ]; then
-    chsh -s /bin/bash postgres
-  fi
-}
-
-post_remove() {
-  if getent passwd postgres >/dev/null; then
-    userdel postgres
-  fi
-  if getent group postgres >/dev/null; then
-    groupdel postgres
-  fi
-}
diff --git a/testing/postgresql/postgresql.logrotate b/testing/postgresql/postgresql.logrotate
deleted file mode 100644
index 9c36918be..000000000
--- a/testing/postgresql/postgresql.logrotate
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/log/postgresql.log {
-   copytruncate
-   missingok
-}
diff --git a/testing/postgresql/postgresql.pam b/testing/postgresql/postgresql.pam
deleted file mode 100644
index 53724d1f8..000000000
--- a/testing/postgresql/postgresql.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/testing/pulseaudio/PKGBUILD b/testing/pulseaudio/PKGBUILD
deleted file mode 100644
index 62f77e97e..000000000
--- a/testing/pulseaudio/PKGBUILD
+++ /dev/null
@@ -1,98 +0,0 @@
-# $Id: PKGBUILD 139039 2011-09-28 19:32:59Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgbase=pulseaudio
-pkgname=(pulseaudio libpulse)
-pkgver=1.0
-pkgrel=1
-arch=(i686 x86_64)
-url="http://pulseaudio.org/"
-license=(GPL LGPL)
-makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
-             speex tdb udev dbus-core xcb-util avahi bluez gconf intltool jack
-             lirc-utils openssl fftw orc json-c)
-options=(!emptydirs !libtool !makeflags)
-source=("http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.gz"
-        $pkgbase.xinit)
-sha256sums=('dfa76b3b48c9918fc24f93cb86bd7dd0fbe5a07019028ae1ac10922e53654783'
-            '3fb64aee43c482b3ea18e1b260c8f310884362b24bcd02a1c117dcd99237312f')
-
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var \
-    --with-database=tdb \
-    --disable-hal \
-    --disable-tcpwrap \
-    --disable-rpath \
-    --disable-default-build-tests
-
-  make
-}
-
-package_pulseaudio() {
-  pkgdesc="A featureful, general-purpose sound server"
-  depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex tdb udev fftw orc)
-  optdepends=('avahi: zeroconf support'
-              'bluez: bluetooth support'
-              'gconf: configuration through gconf (paprefs)'
-              'jack: jack support'
-              'lirc-utils: infra-red support'
-              'openssl: RAOP support'
-              'python2-pyqt: Equalizer GUI (qpaeq)')
-  backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
-  install=pulseaudio.install
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # Lower resample quality, saves CPU
-  sed -e '/resample-method/iresample-method=speex-float-0' \
-      -i "$pkgdir/etc/pulse/daemon.conf"
-
-  # Disable cork-request module, can result in e.g. media players unpausing
-  # when there's a Skype call incoming
-  sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \
-      -i "$pkgdir/usr/bin/start-pulseaudio-x11"
-
-  # Make module-console-kit optional
-  sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \
-      -i "$pkgdir/etc/pulse/default.pa"
-
-  # Python fix
-  sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq"
-
-  install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio"
-
-  rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf"
-
-### Split libpulse
-
-  mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{lib,share/man/man5}}
-
-  mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf
-
-  mv "$pkgdir"/usr/lib/libpulse{,dsp,-simple,-mainloop-glib}.so* \
-     "$pkgdir"/usr/lib/libpulsecommon-*.so \
-     "$srcdir/libpulse/usr/lib"
-
-  mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig
-  mv {"$pkgdir","$srcdir/libpulse"}/usr/include
-
-  mv {"$pkgdir","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5
-  mv {"$pkgdir","$srcdir/libpulse"}/usr/share/vala
-}
-
-package_libpulse() {
-  pkgdesc="A featureful, general-purpose sound server (client library)"
-  depends=(dbus-core xcb-util libasyncns libcap libxtst libsm libsamplerate json-c)
-  optdepends=('alsa-plugins: ALSA support'
-              'avahi: zeroconf support')
-  backup=(etc/pulse/client.conf)
-  mv "$srcdir"/libpulse/* "$pkgdir"
-}
diff --git a/testing/pulseaudio/pulseaudio.install b/testing/pulseaudio/pulseaudio.install
deleted file mode 100644
index fd7db3b36..000000000
--- a/testing/pulseaudio/pulseaudio.install
+++ /dev/null
@@ -1,23 +0,0 @@
-post_install() {
-  cat << MES
->>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details
-    on configuring your system for PulseAudio.
-
->>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio.
-MES
-}
-
-post_upgrade() {
-  # Delete old users and groups
-  # System-wide daemon not supported anymore
-  if (( $(vercmp $2 0.9.22) < 0 )); then
-    getent passwd pulse &>/dev/null && usr/sbin/userdel -f pulse
-    getent group pulse-access &>/dev/null && usr/sbin/groupdel pulse-access
-    getent group pulse-rt &>/dev/null && usr/sbin/groupdel pulse-rt
-    getent group pulse &>/dev/null && usr/sbin/groupdel pulse
-  fi
-
-  true
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/pulseaudio/pulseaudio.xinit b/testing/pulseaudio/pulseaudio.xinit
deleted file mode 100644
index ca510e882..000000000
--- a/testing/pulseaudio/pulseaudio.xinit
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-case "$SESSION" in
-  GNOME|KDE*|xfce4) # PulseAudio is started via XDG Autostart
-  ;;
-  *) /usr/bin/start-pulseaudio-x11 ;;
-esac
diff --git a/testing/pygobject/PKGBUILD b/testing/pygobject/PKGBUILD
deleted file mode 100644
index c6b846ee9..000000000
--- a/testing/pygobject/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 139044 2011-09-28 19:33:04Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=pygobject
-pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.0.0
-pkgrel=1
-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=('ef6735792b0d44287126a6a3b181c85559849063d770506fe06848adb87ce815')
-
-build() {
-  cd "${srcdir}"
-  cp -a "${pkgbase}-${pkgver}" python2-build
-  mkdir devel
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr
-    make
-  )
-
-  (
-    cd "${pkgbase}-${pkgver}"
-    ./configure --prefix=/usr
-    make
-  )
-}
-
-package_python-gobject() {
-  pkgdesc="Python 3 bindings for GObject"
-  depends=('gobject-introspection' 'python-cairo' "pygobject-devel=${pkgver}")
-
-  cd "${srcdir}/${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 "${srcdir}/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 "${srcdir}/devel"
-  mkdir -p "${pkgdir}"/usr/{include,lib}
-  mv include "${pkgdir}/usr/"
-  mv pkgconfig "${pkgdir}/usr/lib/"
-}
diff --git a/testing/pygobject2/PKGBUILD b/testing/pygobject2/PKGBUILD
deleted file mode 100644
index d219677f1..000000000
--- a/testing/pygobject2/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 139042 2011-09-28 19:33:02Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=pygobject2
-pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
-pkgver=2.28.6
-pkgrel=4
-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
-        python3-fix-build.patch
-        python3-fix-maketrans.patch)
-options=('!libtool')
-sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
-            '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}/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/testing/pygobject2/python3-fix-build.patch b/testing/pygobject2/python3-fix-build.patch
deleted file mode 100644
index 4cb8cfe57..000000000
--- a/testing/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/testing/pygobject2/python3-fix-maketrans.patch b/testing/pygobject2/python3-fix-maketrans.patch
deleted file mode 100644
index f5bc0e77c..000000000
--- a/testing/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/testing/rhythmbox/PKGBUILD b/testing/rhythmbox/PKGBUILD
deleted file mode 100644
index c9f64d851..000000000
--- a/testing/rhythmbox/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 139047 2011-09-28 19:33:07Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=rhythmbox
-pkgver=2.90.1.git20110928
-pkgrel=1
-pkgdesc="An iTunes-like music player/libary"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.rhythmbox.org"
-depends=('libgpod' 'gvfs-afc' 'totem-plparser' 'libmusicbrainz3' 'libmtp' 'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'python2-gobject'
-         'python-gnomekeyring' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python-mako' 'grilo' 'dconf')
-makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection')
-optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
-            'gstreamer0.10-bad-plugins: Extra media codecs'
-            'gstreamer0.10-ffmpeg: Extra media codecs'
-            'brasero: cd burning')
-options=('!libtool' '!emptydirs' '!strip')
-install=rhythmbox.install
-#source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b95b2aed0cd485198fbefdcb8dbf2a1ca3d4eb7d31b1e02d610fb16384191e8a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export CFLAGS="$CFLAGS -g -O1"
-  export CXXFLAGS="$CXXFLAGS -g -O1"
-  PYTHON=/usr/bin/python2 ./autogen.sh
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/rhythmbox \
-      --localstatedir=/var --disable-static \
-      --enable-daap --enable-python \
-      --with-mdns=avahi --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/rhythmbox/rhythmbox.install b/testing/rhythmbox/rhythmbox.install
deleted file mode 100644
index cbea0e6b3..000000000
--- a/testing/rhythmbox/rhythmbox.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=rhythmbox
-
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -f -q -t usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-     if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-         usr/sbin/gconfpkg --uninstall ${pkgname}
-     fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/rsync/ChangeLog b/testing/rsync/ChangeLog
deleted file mode 100644
index d07e4ad5a..000000000
--- a/testing/rsync/ChangeLog
+++ /dev/null
@@ -1,39 +0,0 @@
-2011-05-17  Angel Velasquez <angvp@archlinux.org>
-    * rsync 3.0.8-2
-	* Added call_rsync func to rsyncd to support pass arguments to the daemon
-
-2010-01-01  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.7-1
-	* Upstream update
-
-2009-05-08  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.6-1
-	* Upstream update
-
-2008-12-29  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.5-1
-	* Upstream update
-
-2008-09-06  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.4-1
-	* Upstream update
-
-2008-07-05  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.3-1
-	* Upstream update
-
-2008-04-13  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.2-1
-	* Upstream update
-
-2008-03-01  Eric Belanger  <eric@archlinux.org>
-
-	* rsync 3.0.0-1
-	* Upstream update
-	* Updated license
diff --git a/testing/rsync/PKGBUILD b/testing/rsync/PKGBUILD
deleted file mode 100644
index 98521398b..000000000
--- a/testing/rsync/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 138511 2011-09-26 18:43:51Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-pkgname=rsync
-pkgver=3.0.9
-pkgrel=1
-pkgdesc="A file transfer program to keep remote files in sync"
-arch=('i686' 'x86_64')
-url="http://samba.anu.edu.au/rsync/"
-license=('GPL3')
-depends=('acl')
-backup=('etc/rsyncd.conf' 'etc/xinetd.d/rsync')
-changelog=ChangeLog
-source=(http://rsync.samba.org/ftp/rsync/${pkgname}-${pkgver}.tar.gz \
-        rsyncd.conf rsyncd rsync.xinetd)
-md5sums=('5ee72266fe2c1822333c407e1761b92b'
-         '4395c0591638349b1a7aeaaa4da1f03a'
-         '7a9ce3b5de97f3aae29b906f93e1d157'
-         'ea3e9277dc908bc51f9eddc0f6b935c1')
-sha1sums=('c64c8341984aea647506eb504496999fd968ddfc'
-          '48be09294134dfed888818872fe552a59c29147a'
-          'eda623c31d9def454cf8e3e88dcf63de4ca5c08b'
-          'fdb99785bc87ee13d77aa90dc1804f3f75dd7fc1')
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	./prepare-source 
-	./configure --prefix=/usr --with-included-popt \
-              --enable-acl-support --enable-xattr-support 
-	make 
-}
-
-package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install 
-	install -Dm755 ../rsyncd ${pkgdir}/etc/rc.d/rsyncd 
-	install -Dm644 ../rsyncd.conf ${pkgdir}/etc/rsyncd.conf 
-	install -Dm644 ../rsync.xinetd ${pkgdir}/etc/xinetd.d/rsync 
-}
diff --git a/testing/rsync/rsync.xinetd b/testing/rsync/rsync.xinetd
deleted file mode 100644
index f5b6b1ed5..000000000
--- a/testing/rsync/rsync.xinetd
+++ /dev/null
@@ -1,11 +0,0 @@
-service rsync
-{
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/bin/rsync
-        server_args             = --daemon
-        log_on_success  += HOST DURATION
-        log_on_failure  += HOST
-        disable                 = yes
-}
diff --git a/testing/rsync/rsyncd b/testing/rsync/rsyncd
deleted file mode 100644
index d7a772e8e..000000000
--- a/testing/rsync/rsyncd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/rsyncd ] && . /etc/conf.d/rsyncd
-
-function call_rsyncd() {
-	/usr/bin/rsync --daemon $RSYNCD_ARGS
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting rsyncd"
-    [ ! -f /var/run/daemons/rsyncd ] && call_rsyncd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      #pgrep -of "/usr/bin/rsync --daemon" > /var/run/rsyncd.pid # Removed FS#20942
-      add_daemon rsyncd
-      stat_done
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping rsyncd"
-    [ -f /var/run/rsyncd.pid ] && kill `cat /var/run/rsyncd.pid`
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon rsyncd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/rsync/rsyncd.conf b/testing/rsync/rsyncd.conf
deleted file mode 100644
index f7161f3f8..000000000
--- a/testing/rsync/rsyncd.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-uid = nobody
-gid = nobody
-use chroot = no
-max connections = 4
-syslog facility = local5
-pid file = /var/run/rsyncd.pid
-
-[ftp]
-        path = /home/ftp
-        comment = ftp area
-
-#[cvs]
-#        path = /data/cvs
-#        comment = CVS repository (requires authentication)
-#        auth users = tridge, susan
-#        secrets file = /etc/rsyncd.secrets
diff --git a/testing/rubberband/PKGBUILD b/testing/rubberband/PKGBUILD
deleted file mode 100644
index b9549213f..000000000
--- a/testing/rubberband/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 139630 2011-10-03 20:52:06Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Felipe Machado aka arch_audio <machado.felipe@gmail.com>
-
-pkgname=rubberband
-pkgver=1.6.0
-pkgrel=2
-pkgdesc="Time-stretching and pitch-shifting audio library and utility"
-arch=('i686' 'x86_64')
-url="http://www.breakfastquay.com/rubberband/"
-license=('GPL')
-depends=('libsamplerate' 'fftw' 'vamp-plugin-sdk')
-makedepends=('ladspa')
-source=("http://code.breakfastquay.com/attachments/download/16/$pkgname-$pkgver.tar.bz2"
-        'gcc46.patch'
-        'vectorops.patch')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # fix gcc 4.6 compatibility
-  patch -Np1 -i "$srcdir/gcc46.patch"
-
-  # fix bug exposed by gcc 4.6
-  # see https://bugs.archlinux.org/task/26140
-  patch -Np1 -i "$srcdir/vectorops.patch"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('28e3dc1f5ae694d6846bcb0ef3d597fc'
-         '7c2f404975da6052f6b80eac12efbeb4'
-         '4bdc9689179d3a2cf64172f0f911701d')
diff --git a/testing/rubberband/gcc46.patch b/testing/rubberband/gcc46.patch
deleted file mode 100644
index 38ac76d42..000000000
--- a/testing/rubberband/gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- rubberband-1.6.0.orig/rubberband/RubberBandStretcher.h
-+++ rubberband-1.6.0/rubberband/RubberBandStretcher.h
-@@ -21,6 +21,7 @@
- 
- #include <vector>
- #include <map>
-+#include <cstddef>
- 
- /**
-  * @mainpage RubberBand
diff --git a/testing/rubberband/vectorops.patch b/testing/rubberband/vectorops.patch
deleted file mode 100644
index cae961591..000000000
--- a/testing/rubberband/vectorops.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/system/VectorOps.h    Mon Mar 21 21:51:33 2011 +0000
-+++ b/src/system/VectorOps.h    Sun Oct 02 21:12:42 2011 +0100
-@@ -84,8 +84,8 @@
- }
-
- template<typename T>
--inline void v_move(T *const R__ dst,
--                   const T *const R__ src,
-+inline void v_move(T *const dst,
-+                   const T *const src,
-                    const int count)
- {
-     memmove(dst, src, count * sizeof(T));
diff --git a/testing/seahorse/PKGBUILD b/testing/seahorse/PKGBUILD
deleted file mode 100644
index c32552ae1..000000000
--- a/testing/seahorse/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 139049 2011-09-28 19:33:09Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Michel Brabants <michel.linux@tiscali.be>
-
-pkgname=seahorse
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="GNOME application for managing PGP keys."
-arch=(i686 x86_64)
-license=('GPL')
-url="http://projects.gnome.org/seahorse/"
-depends=('gtk3' 'libgnome-keyring' 'gnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
-makedepends=('gettext' 'libldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm')
-options=('!libtool' '!emptydirs')
-groups=('gnome-extra')
-install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ef76aed10bac519fa854a869dc713cd7b49a41fbd2085647067444595302b6f7')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-ldap --enable-hkp \
-      --disable-scrollkeeper \
-      --disable-update-mime-database \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/seahorse/seahorse.install b/testing/seahorse/seahorse.install
deleted file mode 100644
index 9a98d52e0..000000000
--- a/testing/seahorse/seahorse.install
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgname=seahorse
-
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then
-      usr/sbin/gconfpkg --uninstall $pkgname
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/seed/PKGBUILD b/testing/seed/PKGBUILD
deleted file mode 100644
index 73c28b684..000000000
--- a/testing/seed/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 139051 2011-09-28 19:33:11Z ibiru $
-#Maintainer : Ionut Biru <ibiru@archlinux.org>
-#Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=seed
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Library and interpreter for JavaScript with GObject type system bindings."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Seed/"
-license=('LGPL')
-options=('!libtool')
-depends=('libwebkit3' 'gobject-introspection' 'gnome-js-common')
-makedepends=('intltool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('3d1eca40834b72a5730ddaf8a5f46b8df20ddb2b3b39687d1a84ef966d3d37c0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/sqlite3/PKGBUILD b/testing/sqlite3/PKGBUILD
deleted file mode 100644
index cce87e7ef..000000000
--- a/testing/sqlite3/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 138721 2011-09-27 17:48:43Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase="sqlite3"
-pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') 
-_amalgamationver=3070800
-_amalgamationver2=${_amalgamationver/00/}
-_docver=${_amalgamationver}	#3070700
-pkgver=${_amalgamationver2//0/.}
-pkgrel=2
-pkgdesc="A C library that implements an SQL database engine"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.sqlite.org/"
-makedepends=('tcl' 'readline>=6.0.00')
-source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
-	http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz
-	#http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip
-	http://www.sqlite.org/sqlite-doc-${_docver}.zip
-	license.txt)
-options=('!libtool' '!emptydirs')
-md5sums=('6bfb46d73caaa1bbbcd2b52184b6c542'
-         '56c2e37c65075c612710ae1aba9703f2'
-         'c1cdbc5544034d9012e421e75a5e4890')
-sha1sums=('34852cfd49ddea440eb26a35ad32deee0176a724'
-          'e8fec8ca866289477ea4249c219e07bc301d96c6'
-          'f34f6daa4ab3073d74e774aad21d66878cf26853')
-
-build() {
-  export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
-
-  # build sqlite
-  cd "$srcdir"/sqlite-autoconf-$_amalgamationver
-  ./configure --prefix=/usr \
-	--disable-static
-  make
-  
-  # build the tcl extension    
-  cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea
-  ./configure --prefix=/usr \
-	--with-system-sqlite
-  make
-
-}
-
-package_sqlite3() {
- 
- pkgdesc="A C library that implements an SQL database engine"
- depends=('readline>=6.0.00')
- conflicts=('sqlite')
- replaces=('sqlite')
- 
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver
-  make DESTDIR=${pkgdir} install
-  
-  # license
-  install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt
-}
-
-package_sqlite3-tcl() {
- 
- pkgdesc="sqlite3 Tcl Extension Architecture (TEA)"
- depends=('sqlite3>=3.7.5')
-
-  cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea
-  make DESTDIR=${pkgdir} install
-}
-
-package_sqlite3-doc() {
- pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation"
- #arch=('any') - not yet supported
-
-  #cd ${srcdir}/sqlite-doc-${_amalgamationver}
-  cd ${srcdir}/sqlite-doc-${_docver}
-  mkdir -p ${pkgdir}/usr/share/doc/${pkgbase}
-  cp -R *  ${pkgdir}/usr/share/doc/${pkgbase}/
-  
-  # fix permissions and remove obsolete files; https://bugs.archlinux.org/task/24605
-  find ${pkgdir} -type f -perm 755 -exec ls -lha {} \;
-  find ${pkgdir} -type f -perm 755 -exec chmod 644 {} \;
-
-  find ${pkgdir} -type f -name '*~' -exec ls -lha {} \;
-  find ${pkgdir} -type d -name '*~' -exec ls -lha {} \;
-  find ${pkgdir} -name '*~' -exec rm -f {} \;
-
-  find ${pkgdir} -type f -name '.~*' -exec ls -lha {} \; # /build/pkg/sqlite3-doc/usr/share/doc/sqlite3/images/fileformat/.~lock.indexpage.odg#
-  find ${pkgdir} -type d -name '.~*' -exec ls -lha {} \;
-  find ${pkgdir} -name '.~*' -exec rm -f {} \;
-}
diff --git a/testing/sqlite3/license.txt b/testing/sqlite3/license.txt
deleted file mode 100644
index 118c5d5e6..000000000
--- a/testing/sqlite3/license.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-SQLite Copyright
-SQLite is in the
-Public Domain 
-
-
-All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. 
-
-The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. 
-
-All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. 
-Obtaining An Explicit License To Use SQLite
-
-Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: 
-You are using SQLite in a jurisdiction that does not recognize the public domain. 
-You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. 
-You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. 
-Your legal department tells you that you have to purchase a license. 
-
-If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. 
-Contributed Code
-
-In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: 
-The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. 
-
-We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to:
-Hwaci
-6200 Maple Cove Lane
-Charlotte, NC 28269
-USA 
-
-A template copyright release is available in PDF or HTML. You can use this release to make future changes.
-
-see http://www.sqlite.org/copyright.html
-\ No newline at end of file
diff --git a/testing/sushi/PKGBUILD b/testing/sushi/PKGBUILD
deleted file mode 100644
index 3657c9c5b..000000000
--- a/testing/sushi/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 139053 2011-09-28 19:33:13Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=sushi
-pkgver=0.2.0
-pkgrel=1
-pkgdesc="A quick previewer for Nautilus"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-groups=(gnome-extra)
-depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz3' 'libwebkit3' 'gtksourceview3' 'evince')
-makedepends=('intltool' 'gobject-introspection')
-options=(!libtool)
-source=(http://download.gnome.org/sources/$pkgname/0.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('cdefa909afe31403c118f5c4f356dcb4787161f5a4f4ee92054f84b4c13eb59b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --libexecdir=/usr/lib/sushi
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/syslog-ng/PKGBUILD b/testing/syslog-ng/PKGBUILD
deleted file mode 100644
index 672d42bb3..000000000
--- a/testing/syslog-ng/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 140267 2011-10-11 15:32:57Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=syslog-ng
-pkgver=3.3.1
-pkgrel=1
-pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
-arch=('i686' 'x86_64')
-license=('GPL2')
-groups=('base')
-url="http://www.balabit.com/network-security/syslog-ng/"
-depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk')
-makedepends=('flex' 'pkg-config')
-optdepends=('logrotate: for rotating log files')
-provides=('logger')
-options=('!libtool')
-backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \
-        'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
-source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz"
-        syslog-ng.conf
-        syslog-ng.logrotate
-        syslog-ng.rc)
-sha1sums=('f084d66754c7fa1eada56946f77ef3066faa27a1'
-          '98074e0facfc6ef036202662cc86d04b38a2c142'
-          'ac997b25d7d8e69e66782d3771a0e12aff55ae7f'
-          'a6ad26912b5bcbe1b47b003309945d733613b98f')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc/syslog-ng \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var/lib/syslog-ng \
-    --with-pidfile-dir=/run \
-    --disable-spoof-source \
-    --enable-systemd \
-    --with-systemdsystemunitdir=/lib/systemd/system
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d"
-  install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf"
-  install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng"
-  install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng"
-}
diff --git a/testing/syslog-ng/syslog-ng.conf b/testing/syslog-ng/syslog-ng.conf
deleted file mode 100644
index 8f86eac2f..000000000
--- a/testing/syslog-ng/syslog-ng.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-@version: 3.3
-#
-# /etc/syslog-ng/syslog-ng.conf
-#
-
-options {
-  stats_freq (0);
-  flush_lines (0);
-  time_reopen (10);
-  log_fifo_size (10000);
-  chain_hostnames (off);
-  use_dns (no);
-  use_fqdn (no);
-  create_dirs (no);
-  keep_hostname (yes);
-  perm(0640);
-  group("log");
-};
-
-source src {
-  unix-dgram("/dev/log");
-  internal();
-  file("/proc/kmsg");
-};
-
-destination d_authlog { file("/var/log/auth.log"); };
-destination d_syslog { file("/var/log/syslog.log"); };
-destination d_cron { file("/var/log/crond.log"); };
-destination d_daemon { file("/var/log/daemon.log"); };
-destination d_kernel { file("/var/log/kernel.log"); };
-destination d_lpr { file("/var/log/lpr.log"); };
-destination d_user { file("/var/log/user.log"); };
-destination d_uucp { file("/var/log/uucp.log"); };
-destination d_mail { file("/var/log/mail.log"); };
-destination d_news { file("/var/log/news.log"); };
-destination d_ppp { file("/var/log/ppp.log"); };
-destination d_debug { file("/var/log/debug.log"); };
-destination d_messages { file("/var/log/messages.log"); };
-destination d_errors { file("/var/log/errors.log"); };
-destination d_everything { file("/var/log/everything.log"); };
-destination d_iptables { file("/var/log/iptables.log"); };
-destination d_acpid { file("/var/log/acpid.log"); };
-destination d_console { usertty("root"); };
-
-# Log everything to tty12
-destination console_all { file("/dev/tty12"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { program(syslog-ng); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kernel { facility(kern) and not filter(f_iptables); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_news { facility(news); };
-filter f_user { facility(user); };
-filter f_uucp { facility(uucp); };
-filter f_ppp { facility(local2); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); };
-filter f_everything { level(debug..emerg) and not facility(auth, authpriv); };
-filter f_emergency { level(emerg); };
-filter f_info { level(info); };
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); };
-filter f_acpid { program("acpid"); };
-
-log { source(src); filter(f_acpid); destination(d_acpid); };
-log { source(src); filter(f_authpriv); destination(d_authlog); };
-log { source(src); filter(f_syslog); destination(d_syslog); };
-log { source(src); filter(f_cron); destination(d_cron); };
-log { source(src); filter(f_daemon); destination(d_daemon); };
-log { source(src); filter(f_kernel); destination(d_kernel); };
-log { source(src); filter(f_lpr); destination(d_lpr); };
-log { source(src); filter(f_mail); destination(d_mail); };
-log { source(src); filter(f_news); destination(d_news); };
-log { source(src); filter(f_ppp); destination(d_ppp); };
-log { source(src); filter(f_user); destination(d_user); };
-log { source(src); filter(f_uucp); destination(d_uucp); };
-#log { source(src); filter(f_debug); destination(d_debug); };
-log { source(src); filter(f_messages); destination(d_messages); };
-log { source(src); filter(f_err); destination(d_errors); };
-log { source(src); filter(f_emergency); destination(d_console); };
-log { source(src); filter(f_everything); destination(d_everything); };
-log { source(src); filter(f_iptables); destination(d_iptables); };
-
-# Log everything to tty12
-#log { source(src); destination(console_all); };
diff --git a/testing/syslog-ng/syslog-ng.logrotate b/testing/syslog-ng/syslog-ng.logrotate
deleted file mode 100644
index e0e6929f2..000000000
--- a/testing/syslog-ng/syslog-ng.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log {
-	missingok
-	sharedscripts
-	postrotate
-		/bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null`  2> /dev/null || true
-	endscript
-}
diff --git a/testing/syslog-ng/syslog-ng.rc b/testing/syslog-ng/syslog-ng.rc
deleted file mode 100755
index 516b03da3..000000000
--- a/testing/syslog-ng/syslog-ng.rc
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-checkconfig() {
-  if ! syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf; then
-    stat_fail
-    exit 1
-  fi
-}
-
-pidfile=/run/syslog-ng.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ $PID && ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting Syslog-NG"
-    checkconfig
-    if [[ -z $PID ]] && /usr/sbin/syslog-ng; then
-      add_daemon syslog-ng
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Syslog-NG"
-    if [[ $PID ]] && kill $PID &>/dev/null; then
-      rm_daemon syslog-ng
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  reload)
-    stat_busy "Reloading Syslog-NG configuration and re-opening log files"
-    if [[ -z $PID ]]; then
-      stat_fail
-    else
-      checkconfig
-      if kill -HUP $PID &>/dev/null; then
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload}"
-esac
diff --git a/testing/telepathy-farstream/PKGBUILD b/testing/telepathy-farstream/PKGBUILD
deleted file mode 100644
index 4dfe200e3..000000000
--- a/testing/telepathy-farstream/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 139055 2011-09-28 19:33:15Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=telepathy-farstream
-pkgver=0.1.1
-pkgrel=1
-pkgdesc="A telepathy-backend to use stream engine."
-arch=(i686 x86_64)
-url="http://telepathy.freedesktop.org"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'farsight2')
-makedepends=('libxslt' 'python2')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('da9179ee104bfb839cd813f66c23c066')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/telepathy \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/telepathy-gabble/PKGBUILD b/testing/telepathy-gabble/PKGBUILD
deleted file mode 100644
index f47b966c6..000000000
--- a/testing/telepathy-gabble/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 139061 2011-09-28 19:33:20Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Daniel Balieiro <daniel@balieiro.com>
-# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
-pkgname=telepathy-gabble
-pkgver=0.12.7
-pkgrel=1
-pkgdesc="A Jabber/XMPP connection manager for Telepathy"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-groups=('telepathy')
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3')
-makedepends=('libxslt' 'python2')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz)
-install=telepathy-gabble.install
-md5sums=('3518db585403a6cf93ba253200acc5e7')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-  	--libexecdir=/usr/lib/telepathy --with-tls=openssl
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/telepathy-gabble/telepathy-gabble.install b/testing/telepathy-gabble/telepathy-gabble.install
deleted file mode 100644
index 87d7838b8..000000000
--- a/testing/telepathy-gabble/telepathy-gabble.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/telepathy-glib/fix_gnome-shell.patch b/testing/telepathy-glib/fix_gnome-shell.patch
deleted file mode 100644
index 425a6ce48..000000000
--- a/testing/telepathy-glib/fix_gnome-shell.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-commit 014135b89d23f15464d8a82f462ed0f9f98344e0
-Author: Jan Steffens <jan.steffens@gmail.com>
-Date:   Fri Sep 30 21:09:25 2011 +0200
-
-    Revert "Sort alphabetically introspected files"
-    
-    This reverts commit 48998822d5e9575af822c1936b35be514dc2401b.
-    
-    Conflicts:
-    
-    	telepathy-glib/introspection.am
-
-diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am
-index 2027c5f..0c867cc 100644
---- a/telepathy-glib/introspection.am
-+++ b/telepathy-glib/introspection.am
-@@ -8,63 +8,64 @@ introspection_extra_dist = \
- if HAVE_INTROSPECTION
- 
- INTROSPECTION_FILES = \
-+	$(srcdir)/proxy.c _gen/proxy-introspectable.h \
- 	$(srcdir)/account.c $(srcdir)/account.h \
- 	$(srcdir)/account-channel-request.c $(srcdir)/account-channel-request.h \
- 	$(srcdir)/account-manager.c $(srcdir)/account-manager.h \
--	$(srcdir)/add-dispatch-operation-context.c $(srcdir)/add-dispatch-operation-context.h \
- 	$(srcdir)/automatic-client-factory.c $(srcdir)/automatic-client-factory.h \
- 	$(srcdir)/automatic-proxy-factory.c $(srcdir)/automatic-proxy-factory.h \
--	$(srcdir)/base-client.c $(srcdir)/base-client.h \
--	$(srcdir)/base-connection.c $(srcdir)/base-connection.h \
- 	$(srcdir)/basic-proxy-factory.c $(srcdir)/basic-proxy-factory.h \
--	$(srcdir)/capabilities.c $(srcdir)/capabilities.h \
--	$(srcdir)/channel.c $(srcdir)/channel.h \
--	$(srcdir)/channel-contacts.c \
--	$(srcdir)/channel-dispatcher.c $(srcdir)/channel-dispatcher.h \
--	$(srcdir)/channel-dispatch-operation.c $(srcdir)/channel-dispatch-operation.h \
--	$(srcdir)/channel-group.c \
--	$(srcdir)/channel-request.c $(srcdir)/channel-request.h \
- 	$(srcdir)/client-channel-factory.c $(srcdir)/client-channel-factory.h \
--	$(srcdir)/client-message.c $(srcdir)/client-message.h \
- 	$(srcdir)/connection.c $(srcdir)/connection.h \
--	$(srcdir)/connection-avatars.c \
- 	$(srcdir)/connection-contact-list.c $(srcdir)/connection-contact-list.h \
- 	$(srcdir)/connection-handles.c $(srcdir)/connection-contact-info.c \
-+	$(srcdir)/connection-avatars.c \
-+	$(srcdir)/protocol.c $(srcdir)/protocol.h \
- 	$(srcdir)/connection-manager.c $(srcdir)/connection-manager.h \
-+	$(srcdir)/channel.c $(srcdir)/channel.h \
-+	$(srcdir)/channel-contacts.c \
-+	$(srcdir)/channel-group.c \
-+	$(srcdir)/handle.c $(srcdir)/handle.h \
-+	$(srcdir)/handle-channels-context.c $(srcdir)/handle-channels-context.h \
-+	$(srcdir)/dbus-daemon.c $(srcdir)/dbus-daemon.h \
-+	$(srcdir)/interfaces.c \
-+	$(srcdir)/intset.c $(srcdir)/intset.h \
-+	$(srcdir)/dbus.c $(srcdir)/dbus.h \
-+	$(srcdir)/capabilities.c $(srcdir)/capabilities.h \
- 	$(srcdir)/contact.c $(srcdir)/contact.h \
- 	$(srcdir)/contact-operations.c $(srcdir)/contact-operations.h \
- 	$(srcdir)/contact-search.c $(srcdir)/contact-search.h \
- 	$(srcdir)/contact-search-result.c $(srcdir)/contact-search-result.h \
--	$(srcdir)/contacts-mixin.c $(srcdir)/contacts-mixin.h \
--	$(srcdir)/dbus.c $(srcdir)/dbus.h \
--	$(srcdir)/dbus-daemon.c $(srcdir)/dbus-daemon.h \
--	$(srcdir)/dbus-properties-mixin.c $(srcdir)/dbus-properties-mixin.h \
--	$(srcdir)/dbus-tube-channel.c $(srcdir)/dbus-tube-channel.h \
--	$(srcdir)/debug.c $(srcdir)/debug.h \
- 	$(srcdir)/defs.h \
--	$(srcdir)/errors.c $(srcdir)/errors.h \
--	$(srcdir)/file-transfer-channel.c $(srcdir)/file-transfer-channel.h \
--	$(srcdir)/group-mixin.c $(srcdir)/group-mixin.h \
--	$(srcdir)/handle.c $(srcdir)/handle.h \
--	$(srcdir)/handle-channels-context.c $(srcdir)/handle-channels-context.h \
--	$(srcdir)/handle-repo.c $(srcdir)/handle-repo.h $(srcdir)/handle-set.c \
--	$(srcdir)/interfaces.c \
--	$(srcdir)/intset.c $(srcdir)/intset.h \
--	$(srcdir)/message.c $(srcdir)/message.h \
--	$(srcdir)/observe-channels-context.c $(srcdir)/observe-channels-context.h \
--	$(srcdir)/presence-mixin.c $(srcdir)/presence-mixin.h \
--	$(srcdir)/protocol.c $(srcdir)/protocol.h \
--	$(srcdir)/proxy.c _gen/proxy-introspectable.h \
--	$(srcdir)/signalled-message.c $(srcdir)/signalled-message.h \
-+	$(srcdir)/debug.c $(srcdir)/debug.h \
-+	$(srcdir)/base-client.c $(srcdir)/base-client.h \
- 	$(srcdir)/simple-approver.c $(srcdir)/simple-approver.h \
- 	$(srcdir)/simple-client-factory.c $(srcdir)/simple-client-factory.h \
- 	$(srcdir)/simple-handler.c $(srcdir)/simple-handler.h \
- 	$(srcdir)/simple-observer.c $(srcdir)/simple-observer.h \
-+	$(srcdir)/dbus-properties-mixin.c $(srcdir)/dbus-properties-mixin.h \
-+	$(srcdir)/contacts-mixin.c $(srcdir)/contacts-mixin.h \
-+	$(srcdir)/group-mixin.c $(srcdir)/group-mixin.h \
-+	$(srcdir)/presence-mixin.c $(srcdir)/presence-mixin.h \
-+	$(srcdir)/channel-dispatch-operation.c $(srcdir)/channel-dispatch-operation.h \
-+	$(srcdir)/channel-request.c $(srcdir)/channel-request.h \
-+	$(srcdir)/observe-channels-context.c $(srcdir)/observe-channels-context.h \
-+	$(srcdir)/add-dispatch-operation-context.c $(srcdir)/add-dispatch-operation-context.h \
-+	$(srcdir)/protocol.c $(srcdir)/protocol.h \
-+	$(srcdir)/base-connection.c $(srcdir)/base-connection.h \
-+	$(srcdir)/handle-repo.c $(srcdir)/handle-repo.h $(srcdir)/handle-set.c \
- 	$(srcdir)/stream-tube-channel.c $(srcdir)/stream-tube-channel.h \
-+	$(srcdir)/dbus-tube-channel.c $(srcdir)/dbus-tube-channel.h \
- 	$(srcdir)/stream-tube-connection.c $(srcdir)/stream-tube-connection.h \
- 	$(srcdir)/text-channel.c $(srcdir)/text-channel.h \
-+	$(srcdir)/file-transfer-channel.c $(srcdir)/file-transfer-channel.h \
-+	$(srcdir)/client-message.c $(srcdir)/client-message.h \
-+	$(srcdir)/message.c $(srcdir)/message.h \
-+	$(srcdir)/signalled-message.c $(srcdir)/signalled-message.h \
-+	$(srcdir)/channel-dispatcher.c $(srcdir)/channel-dispatcher.h \
-+	$(srcdir)/errors.c $(srcdir)/errors.h \
- 	_gen/telepathy-enums.h _gen/telepathy-enums-gtk-doc.h \
--	_gen/telepathy-interfaces.h _gen/telepathy-interfaces-gtk-doc.h\
-+	_gen/telepathy-interfaces.h \
- 	$(NULL)
- 
- _gen/proxy-introspectable.h: proxy.h introspection.am
-@@ -76,7 +77,6 @@ TelepathyGLib-0.12.gir: $(INTROSPECTION_SCANNER) \
- 		$(srcdir)/kludge.xsl \
- 		$(INTROSPECTION_FILES)
- 	$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
--		--warn-all \
- 		--namespace TelepathyGLib \
- 		--nsversion=0.12 \
- 		--identifier-prefix=Tp \
-
diff --git a/testing/telepathy-mission-control/PKGBUILD b/testing/telepathy-mission-control/PKGBUILD
deleted file mode 100644
index 82c0f846f..000000000
--- a/testing/telepathy-mission-control/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 139858 2011-10-05 14:00:12Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Ju Liu <liuju86 at gmail dot com>
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-# Contributor: Andreas Zwinkau <beza1e1@web.de>
-pkgname=telepathy-mission-control
-pkgver=5.9.3
-pkgrel=1
-pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers."
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org/wiki/Mission Control"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libgnome-keyring')
-makedepends=('libxslt' 'python2')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz)
-md5sums=('15fc8e560bc67a86393a3138d7ac38e3')
-
-build() {
-    cd "$srcdir/$pkgname-$pkgver"
-    ./configure --prefix=/usr \
-    	--libexecdir=/usr/lib/telepathy \
-	--enable-gnome-keyring
-    make
-}
-
-package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/tomboy/PKGBUILD b/testing/tomboy/PKGBUILD
deleted file mode 100644
index 6e4a9c65d..000000000
--- a/testing/tomboy/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 139063 2011-09-28 19:33:22Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=tomboy
-pkgver=1.8.0
-pkgrel=1
-pkgdesc="Desktop note-taking application for Linux and Unix"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/tomboy/"
-depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme')
-makedepends=('intltool' 'pkgconfig'  'gnome-doc-utils')
-options=('!libtool' '!emptydirs' '!makeflags')
-groups=('gnome-extra')
-install=tomboy.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.8/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4f3808a8c0ef94440a2ca005e41b095a417bfd22dc081e2e55e5de69b4e4df70')
-
-build() {
-  export MONO_SHARED_DIR="${srcdir}/.wabi"
-  mkdir -p "${MONO_SHARED_DIR}"
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper \
-      --disable-update-mimedb
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain tomboy ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/tomboy/tomboy.install b/testing/tomboy/tomboy.install
deleted file mode 100644
index f8e2e4a07..000000000
--- a/testing/tomboy/tomboy.install
+++ /dev/null
@@ -1,25 +0,0 @@
-pkgname=tomboy
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime
-}
diff --git a/testing/totem/PKGBUILD b/testing/totem/PKGBUILD
deleted file mode 100644
index 9ea91174e..000000000
--- a/testing/totem/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 139155 2011-09-30 11:49:44Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=totem
-pkgname=('totem' 'totem-plugin')
-pkgver=3.2.0
-pkgrel=2
-pkgdesc="A GNOME3 integrated movie player based on Gstreamer."
-url="http://www.gnome.org"
-arch=('i686' 'x86_64')
-license=('GPL2' 'custom')
-depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm'
-         'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme'
-         'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf' 'clutter-gst'
-         'clutter-gtk' 'mx')
-makedepends=('intltool' 'gtk-doc' 'python2-gobject' 'nautilus' 'libgdata' 'xulrunner' 'lirc-utils'
-             'libepc' 'bluez' 'vala' 'grilo')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('97277b6746bdbfa7de185fa20602bfb5c72b77169f346311001d4013a93f9139')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/totem \
-    --localstatedir=/var \
-    --disable-static \
-    --enable-python \
-    --enable-nautilus
-  make
-}
-
-package_totem() {
-  groups=('gnome-extra')
-  install=totem.install
-  optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
-              'gstreamer0.10-bad-plugins: Extra media codecs'
-              'gstreamer0.10-ffmpeg: Extra media codecs'
-              'lirc-utils: Infrared Remote Control plugin'
-              'libepc: Publish Playlist plugin'
-              'libgdata: YouTube Browser plugin'
-              'bluez: Bemused plugin'
-              'grilo-plugins: Browse sidebar (remote media)')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -r "${pkgdir}/usr/lib/mozilla"
-  rm "${pkgdir}/usr/lib/totem/totem-plugin-viewer"
-
-  sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \
-    $pkgdir/usr/lib/totem/{totem/totem-bugreport.py,plugins/iplayer/iplayer2.py}
-
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem/COPYING"
-}
-
-package_totem-plugin() {
-  pkgdesc="Totem mozilla/firefox plugin"
-  depends=("totem=${pkgver}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C browser-plugin \
-    plugindir=/usr/lib/mozilla/plugins \
-    xptdir=/usr/lib/mozilla/plugins \
-    DESTDIR="${pkgdir}" install
-
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/totem-plugin/COPYING"
-}
diff --git a/testing/totem/totem.install b/testing/totem/totem.install
deleted file mode 100644
index 07cb42dcb..000000000
--- a/testing/totem/totem.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.91.91) < 0 )); then
-    usr/sbin/gconfpkg --uninstall totem
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/tracker/PKGBUILD b/testing/tracker/PKGBUILD
deleted file mode 100644
index 18b663fc7..000000000
--- a/testing/tracker/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 139067 2011-09-28 19:33:26Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-
-pkgbase=tracker
-pkgname=(tracker libtracker-sparql)
-pkgver=0.12.3
-_tver=${pkgver%.*}
-pkgrel=1
-pkgdesc="All-in-one indexer, search tool and metadata database"
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
-             'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
-             'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection'
-             'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser'
-             'evolution' 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac'
-             'vala')
-url="http://www.gnome.org"
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('97c9e151d48878409129eeeea2da0716f14a52d6097d8db3b304c6af0b7ae187')
-
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/tracker \
-    --disable-unit-tests \
-    --enable-libflac \
-    --enable-libvorbis
-
-  make
-}
-
-package_tracker() {
-  depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring'
-           'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca'
-           'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
-  optdepends=('giflib: extractor for GIF data'
-              'gstreamer0.10-base: video extractor'
-              'totem-plparser: playlist support'
-              'evolution: Evolution email data miner'
-              'nautilus: nautilus-extension'
-              'libvorbis: Vorbis metadata extractor'
-              'flac: FLAC metadata extractor'
-              'taglib: writeback for audio files'
-              'gnome-panel: tracker-search-bar')
-  groups=('gnome-extra')
-  install=tracker.install
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-### Split libtracker-sparql
-
-  mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver
-  mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig}
-  mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi}
-
-  mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib"
-
-  mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \
-    "$srcdir/sparql/usr/lib/tracker-$_tver"
-
-  mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \
-    "$srcdir/sparql/usr/share/vala/vapi"
-
-  mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql
-  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib
-  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc
-  mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir
-}
-
-package_libtracker-sparql() {
-  pkgdesc="$pkgdesc (SPARQL library)"
-  depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
-
-  mv "$srcdir"/sparql/* "$pkgdir"
-}
diff --git a/testing/tracker/tracker.install b/testing/tracker/tracker.install
deleted file mode 100644
index 95114273e..000000000
--- a/testing/tracker/tracker.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/tzdata/Makefile.patch b/testing/tzdata/Makefile.patch
deleted file mode 100644
index e88f9d907..000000000
--- a/testing/tzdata/Makefile.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff -Naur src/Makefile src-p/Makefile
---- src/Makefile	2007-08-20 16:47:41.000000000 +0200
-+++ src-p/Makefile	2007-10-02 04:07:44.000000000 +0200
-@@ -34,17 +34,17 @@
- 
- # Everything gets put in subdirectories of. . .
- 
--TOPDIR=		/usr/local
-+TOPDIR=		$(DESTDIR)/usr
- 
- # "Compiled" time zone information is placed in the "TZDIR" directory
- # (and subdirectories).
- # Use an absolute path name for TZDIR unless you're just testing the software.
- 
--TZDIR=		$(TOPDIR)/etc/zoneinfo
-+TZDIR=		$(TOPDIR)/share/zoneinfo
- 
- # The "tzselect", "zic", and "zdump" commands get installed in. . .
- 
--ETCDIR=		$(TOPDIR)/etc
-+SBINDIR=		$(TOPDIR)/sbin
- 
- # If you "make INSTALL", the "date" command gets installed in. . .
- 
-@@ -52,7 +52,7 @@
- 
- # Manual pages go in subdirectories of. . .
- 
--MANDIR=		$(TOPDIR)/man
-+MANDIR=		$(TOPDIR)/share/man
- 
- # Library functions are put in an archive in LIBDIR.
- 
-@@ -83,7 +83,7 @@
- 
- # Non-default libraries needed to link.
- # Add -lintl if you want to use `gettext' on Solaris.
--LDLIBS=
-+LDLIBS=$(LDFLAGS)
- 
- # Add the following to the end of the "CFLAGS=" line as needed.
- #  -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc)
-@@ -211,7 +211,7 @@
- # before the first Monday in January when a "%V" format is used and January 1
- # falls on a Friday, Saturday, or Sunday.
- 
--CFLAGS=
-+CFLAGS += -std=gnu99
- 
- # If you want zic's -s option used when installing, uncomment the next line
- # ZFLAGS=	-s
-@@ -220,7 +220,7 @@
- ZIC=		$(zic) $(ZFLAGS)
- 
- # The name of a Posix-compliant `awk' on your system.
--AWK=		nawk
-+AWK=		awk
- 
- # The path where SGML DTDs are kept.
- SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/
-@@ -241,8 +241,10 @@
- 
- ###############################################################################
- 
--cc=		cc
--CC=		$(cc) -DTZDIR=\"$(TZDIR)\"
-+CC+=		-DTZDIR=\"$(TZDIR)\"
-+ifeq ($(NLS),1)
-+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\"
-+endif
- 
- TZCSRCS=	zic.c localtime.c asctime.c scheck.c ialloc.c
- TZCOBJS=	zic.o localtime.o asctime.o scheck.o ialloc.o
-@@ -282,14 +284,16 @@
- 
- ALL:		all date
- 
--install:	all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA)
-+install:	all $(DATA) $(REDO) $(MANS) $(TABDATA)
- 		$(ZIC) -y $(YEARISTYPE) \
- 			-d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
- 		-rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab
- 		cp iso3166.tab zone.tab $(TZDIR)/.
--		-mkdir $(TOPDIR) $(ETCDIR)
--		cp tzselect zic zdump $(ETCDIR)/.
--		-mkdir $(TOPDIR) $(MANDIR) \
-+		-mkdir -p $(TOPDIR) $(SBINDIR)
-+		cp zic zdump $(SBINDIR)/.
-+		-mkdir -p $(TOPDIR) $(BINDIR)
-+		cp tzselect $(BINDIR)/.
-+		-mkdir -p $(TOPDIR) $(MANDIR) \
- 			$(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8
- 		-rm -f $(MANDIR)/man3/newctime.3 \
- 			$(MANDIR)/man3/newtzset.3 \
-@@ -298,13 +302,11 @@
- 			$(MANDIR)/man8/zdump.8 \
- 			$(MANDIR)/man8/zic.8
- 		cp newctime.3 newtzset.3 $(MANDIR)/man3/.
--		cp tzfile.5 $(MANDIR)/man5/.
--		cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/.
- 
- INSTALL:	ALL install date.1
--		-mkdir $(TOPDIR) $(BINDIR)
-+		-mkdir -p $(TOPDIR) $(BINDIR)
- 		cp date $(BINDIR)/.
--		-mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1
-+		-mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1
- 		-rm -f $(MANDIR)/man1/date.1
- 		cp date.1 $(MANDIR)/man1/.
- 
-@@ -334,9 +336,9 @@
- # You must replace all of $(TZDIR) to switch from not using leap seconds
- # to using them, or vice versa.
- other_two:	zic leapseconds $(TDATA)
--		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA)
-+		$(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA)
- 		$(ZIC) -y $(YEARISTYPE) \
--			-d $(TZDIR)-leaps -L leapseconds $(TDATA)
-+			-d $(TZDIR)/right -L leapseconds $(TDATA)
- 
- posix_right:	posix_only other_two
- 
-@@ -367,7 +369,7 @@
- 			<$? >$@
- 		chmod +x $@
- 
--check:		check_tables check_web
-+check:		check_tables
- 
- check_tables:	checktab.awk $(PRIMARY_YDATA)
- 		$(AWK) -f checktab.awk $(PRIMARY_YDATA)
-diff -Naur src/tzselect.ksh src-p/tzselect.ksh
---- src/tzselect.ksh	2007-08-20 16:47:42.000000000 +0200
-+++ src-p/tzselect.ksh	2007-10-02 04:07:44.000000000 +0200
-@@ -1,4 +1,4 @@
--#! /bin/ksh
-+#! /bin/bash
- 
- # '@(#)tzselect.ksh	8.1'
- 
diff --git a/testing/tzdata/PKGBUILD b/testing/tzdata/PKGBUILD
deleted file mode 100644
index eb9ee769c..000000000
--- a/testing/tzdata/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 138515 2011-09-26 19:11:52Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=tzdata
-pkgver=2011k
-pkgrel=1
-_tzcode=2011i
-_tzdata=2011k
-pkgdesc="Sources for time zone and daylight saving time data"
-arch=('i686' 'x86_64')
-url="http://www.twinsun.com/tz/tz-link.htm"
-license=('GPL')
-depends=()
-makedepends=()
-optdepends=('bash: required by tzselect')
-options=('!emptydirs')
-source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \
-        ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \
-        Makefile.patch)
-md5sums=('cf7f4335b7c8682899fa2814e711c1b2'
-         '9da1c2d4d1a01f9f504b73ccd371830f'
-         'a64ed97d1fc03c66ee8612c0d9f40507')
-sha1sums=('4f58cede47df8bba55b37982d8b38cd65266d412'
-          '56f0847a10eaea672be19984b4b403e29631c98b'
-          'e8890681333949977ccff0b7a429ad25ed78dbcf')
-
-build() {
-  cd ${srcdir}
-
-  tar -xf tzcode${_tzcode}.tar.gz
-  tar -xf ${pkgname}${_tzdata}.tar.gz
-
-  patch -Np1 -i "${srcdir}/Makefile.patch"
-
-  make
-}
-
-check() {
-  cd ${srcdir}
-  make check
-}
-
-package() {
-  cd ${srcdir}
-  make DESTDIR="${pkgdir}" install
-
-  rm "${pkgdir}/usr/share/zoneinfo/localtime"
-}
diff --git a/testing/upower/PKGBUILD b/testing/upower/PKGBUILD
deleted file mode 100644
index c35dd9baa..000000000
--- a/testing/upower/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 139069 2011-09-28 19:33:28Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=upower
-pkgver=0.9.13
-pkgrel=2
-pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
-arch=('i686' 'x86_64')
-url="http://upower.freedesktop.org"
-license=('GPL')
-depends=('udev' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
-makedepends=('pkg-config' 'intltool' 'docbook-xsl' 'gobject-introspection')
-replaces=('devicekit-power')
-options=('!libtool')
-source=($url/releases/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2c7dd2c26d11da628d68111d50eed51244a8337c1d0830addecd1372a7d44a22')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/upower --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD
deleted file mode 100644
index 8b63895c4..000000000
--- a/testing/util-linux/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 138305 2011-09-19 22:14:14Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=util-linux
-pkgver=2.20
-pkgrel=3
-pkgdesc="Miscellaneous system utilities for Linux"
-url="http://userweb.kernel.org/~kzak/util-linux-ng/"
-arch=('i686' 'x86_64')
-groups=('base')
-depends=('filesystem')
-replaces=('linux32' 'util-linux-ng')
-conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2')
-provides=('linux32' "util-linux-ng=${pkgver}")
-license=('GPL2')
-options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2
-	agetty-typo.patch
-	write-freopen.patch
-	dmesg-non-printk.patch
-	dmesg-space.patch
-	dont-close-0.patch
-	fix-remount.patch)
-optdepends=('perl: for chkdupexe support')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # patches from master
-  for patch in agetty-typo.patch write-freopen.patch dmesg-non-printk.patch dmesg-space.patch dont-close-0.patch fix-remount.patch; do
-    patch -Np1 -i "${srcdir}/${patch}"
-  done
-
-  # hardware clock
-  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h
-
-  ./configure --enable-arch\
-              --enable-write\
-              --enable-raw\
-              --disable-wall\
-              --enable-partx\
-              --enable-libmount-mount
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -dm755 "${pkgdir}/var/lib/hwclock"
-
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('4dcacdbdafa116635e52b977d9d0e879'
-         '13838c6dd8df686e0f01ad0f236d2690'
-         '465817ff8f7c08411c8011ee91b50318'
-         'f3ca75a1a22a2a739c5c22d92dc07ab0'
-         'd9768f0b42d36d72c02ac7797b922ba1'
-         '37eae52af90c214dda73874c701fa246'
-         '344c780b9e08826dd8befe4271b41ed3')
diff --git a/testing/util-linux/agetty-typo.patch b/testing/util-linux/agetty-typo.patch
deleted file mode 100644
index a333d6280..000000000
--- a/testing/util-linux/agetty-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 89aed1c950376d828e1e0ddef94909a028e0517d Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Wed, 7 Sep 2011 07:37:03 +0200
-Subject: [PATCH] agetty: double equals sign typo in opentty()
-
-Reported-by: Francesco Cosoleto <cosoleto@gmail.com>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- term-utils/agetty.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/term-utils/agetty.c b/term-utils/agetty.c
-index 733be38..35bb389 100644
---- a/term-utils/agetty.c
-+++ b/term-utils/agetty.c
-@@ -985,7 +985,7 @@ static void open_tty(char *tty, struct termios *tp, struct options *op)
- 	 * In case of a virtual console the ioctl TIOCMGET fails and
- 	 * the error number will be set to EINVAL.
- 	 */
--	if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno = EINVAL)) {
-+	if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno == EINVAL)) {
- 		op->flags |= F_VCONSOLE;
- 		if (!op->term)
- 			op->term = DEFAULT_VCTERM;
--- 
-1.7.6.1
-
diff --git a/testing/util-linux/dmesg-non-printk.patch b/testing/util-linux/dmesg-non-printk.patch
deleted file mode 100644
index ea2354420..000000000
--- a/testing/util-linux/dmesg-non-printk.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 22f69825778f992ff98ed100252bf5e00a15d9d1 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Wed, 31 Aug 2011 12:28:39 +0200
-Subject: [PATCH] dmesg: fix for non-CONFIG_PRINTK_TIME kernels
-
- * dmesg(1) incorrectly assumes that lines like "<6>\n"
-   are broken.
-
- * it's more robust to assume the end of the record is "\n<"
-
- * print \n for empty lines
-
-Reported-by: "Gabor Z. Papp" <gzp@papp.hu>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- sys-utils/dmesg.c |   16 ++++++++--------
- 1 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
-index 6090f4e..8e7bb4b 100644
---- a/sys-utils/dmesg.c
-+++ b/sys-utils/dmesg.c
-@@ -442,12 +442,12 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec)
- 
- 		if (!begin)
- 			begin = p;
--		if (*p == '\n')
--			end = p;
- 		if (i + 1 == rec->next_size) {
- 			end = p + 1;
- 			i++;
--		}
-+		} else if (*p == '\n' && *(p + 1) == '<')
-+			end = p;
-+
- 		if (begin && !*begin)
- 			begin = NULL;	/* zero(s) at the end of the buffer? */
- 		if (!begin || !end)
-@@ -469,9 +469,6 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec)
- 			}
- 		}
- 
--		if (end <= begin)
--			return -1;	/* error */
--
- 		if (*begin == '[' && (*(begin + 1) == ' ' ||
- 				      isdigit(*(begin + 1)))) {
- 			if (ctl->delta || ctl->ctime) {
-@@ -534,12 +531,15 @@ static void print_buffer(const char *buf, size_t size,
- 	}
- 
- 	while (get_next_record(ctl, &rec) == 0) {
--		if (!rec.mesg_size)
--			continue;
- 
- 		if (!accept_record(ctl, &rec))
- 			continue;
- 
-+		if (!rec.mesg_size) {
-+			putchar('\n');
-+			continue;
-+		}
-+
- 		if (ctl->decode && rec.level >= 0 && rec.facility >= 0)
- 			printf("%-6s:%-6s: ", facility_names[rec.facility].name,
- 					      level_names[rec.level].name);
--- 
-1.7.6.1
-
diff --git a/testing/util-linux/dmesg-space.patch b/testing/util-linux/dmesg-space.patch
deleted file mode 100644
index 2038888cc..000000000
--- a/testing/util-linux/dmesg-space.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 31c9099a81d3a9c70fdceb198eebed678173d954 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Fri, 2 Sep 2011 14:42:04 +0200
-Subject: [PATCH] dmesg: remove extra space only after time stamp
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- sys-utils/dmesg.c |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
-index 8e7bb4b..b3713a0 100644
---- a/sys-utils/dmesg.c
-+++ b/sys-utils/dmesg.c
-@@ -480,11 +480,10 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec)
- 						break;
- 				}
- 			}
-+			if (begin < end && *begin == ' ')
-+				begin++;
- 		}
- 
--		if (begin < end && *begin == ' ')
--			begin++;
--
- 		rec->mesg = begin;
- 		rec->mesg_size = end - begin;
- 
--- 
-1.7.6.1
-
diff --git a/testing/util-linux/dont-close-0.patch b/testing/util-linux/dont-close-0.patch
deleted file mode 100644
index 75cfc5c5e..000000000
--- a/testing/util-linux/dont-close-0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3a18db62e661fbb307ad3a53c18afabc92d3c63e Mon Sep 17 00:00:00 2001
-From: Petr Uzel <petr.uzel@suse.cz>
-Date: Tue, 13 Sep 2011 11:08:46 +0200
-Subject: [PATCH 1/2] lib: do not attempt to close(0) in sysfs_deinit()
-
-If the 'open' fails we 'goto err' which runs 'sysfs_deinit()' on a 'cxt'
-which hasn't been fully initialised. The 'dir_fd' is still 0, so
-sysfs_deinit calls "close(0)".
-
-Addresses: https://bugzilla.novell.com/show_bug.cgi?id=714151
-Reported-by: Diego Ercolani <diego.ercolani@gmail.com>
-Analysed-by: Neil Brown <nfbrown@suse.com>
-Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
----
- lib/sysfs.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/lib/sysfs.c b/lib/sysfs.c
-index eec1f24..ebb3bb5 100644
---- a/lib/sysfs.c
-+++ b/lib/sysfs.c
-@@ -140,6 +140,7 @@ int sysfs_init(struct sysfs_cxt *cxt, dev_t devno, struct sysfs_cxt *parent)
- 	int fd, rc = 0;
- 
- 	memset(cxt, 0, sizeof(*cxt));
-+	cxt->dir_fd = -1;
- 
- 	if (!sysfs_devno_path(devno, path, sizeof(path)))
- 		goto err;
--- 
-1.7.6.1
-
diff --git a/testing/util-linux/fix-remount.patch b/testing/util-linux/fix-remount.patch
deleted file mode 100644
index 67149ab46..000000000
--- a/testing/util-linux/fix-remount.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 277a6dd53569a409e05316a7bdaed0e78e326762 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 13 Sep 2011 22:59:39 +0200
-Subject: [PATCH 2/2] mount: check for target before source on remount
-
-Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=737091
-Reported-by: Eric Paris <eparis@redhat.com>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- mount/fstab.c |    9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/mount/fstab.c b/mount/fstab.c
-index 8d88f68..77bf81c 100644
---- a/mount/fstab.c
-+++ b/mount/fstab.c
-@@ -272,10 +272,15 @@ getmntfilebackward (const char *name, struct mntentchn *mcprev) {
- 	mc0 = mtab_head();
- 	if (!mcprev)
- 		mcprev = mc0;
-+
- 	for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev)
--		if (streq(mc->m.mnt_dir, name) ||
--		    streq(mc->m.mnt_fsname, name))
-+		if (streq(mc->m.mnt_dir, name))
- 			return mc;
-+
-+	for (mc = mcprev->prev; mc && mc != mc0; mc = mc->prev)
-+		if (streq(mc->m.mnt_fsname, name))
-+			return mc;
-+
- 	return NULL;
- }
- 
--- 
-1.7.6.1
-
diff --git a/testing/util-linux/write-freopen.patch b/testing/util-linux/write-freopen.patch
deleted file mode 100644
index a2014a107..000000000
--- a/testing/util-linux/write-freopen.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b89fdd9c05a6e5f12ab56441389e5ee9d1d7f30f Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 6 Sep 2011 03:18:46 +0200
-Subject: [PATCH] write: fix path for freopen()
-
-Reported-by: xinglp <xinglp@gmail.com>
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- term-utils/write.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/term-utils/write.c b/term-utils/write.c
-index a825f62..a70eb7b 100644
---- a/term-utils/write.c
-+++ b/term-utils/write.c
-@@ -322,7 +322,7 @@ void do_write(char *tty, char *mytty, uid_t myuid)
- 
- 	if (strlen(tty) + 6 > sizeof(path))
- 		errx(EXIT_FAILURE, _("tty path %s too long"), tty);
--	printf(path, "/dev/%s", tty);
-+	snprintf(path, sizeof(path), "/dev/%s", tty);
- 	if ((freopen(path, "w", stdout)) == NULL)
- 		err(EXIT_FAILURE, "%s", path);
- 
--- 
-1.7.6.1
-
diff --git a/testing/vala/PKGBUILD b/testing/vala/PKGBUILD
deleted file mode 100644
index e45f801bb..000000000
--- a/testing/vala/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 139071 2011-09-28 19:33:30Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Timm Preetz <timm@preetz.us>
-
-pkgname=vala
-pkgver=0.14.0
-pkgrel=1
-pkgdesc="Compiler for the GObject type system"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Vala"
-license=('LGPL')
-depends=('glib2')
-makedepends=('libxslt')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.14/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('3830a30b54738ddfb29ab7819a4ac2370392f52fde090742a8a304fadaec747c')
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure --prefix=/usr --enable-vapigen
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/vinagre/PKGBUILD b/testing/vinagre/PKGBUILD
deleted file mode 100644
index 075ad8f9b..000000000
--- a/testing/vinagre/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 139073 2011-09-28 19:33:31Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Allan McRae <mcrae_allan@hotmail.com>
-# Contributor: lp76 <l.peduto@gmail.com>
-
-pkgname=vinagre
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="A VNC Client for the GNOME Desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/vinagre/"
-install=vinagre.install
-depends=('libgnome-keyring' 'gtk-vnc' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme')
-optdepends=('rdesktop: RDP plugin')
-makedepends=('gtk-doc' 'intltool' 'rdesktop')
-groups=('gnome-extra')
-options=('!emptydirs' '!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('9ba0d13000d81d0e47f456b138f52ef2cb7a603c71381993952acc87c25e2e61')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-scrollkeeper \
-      --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/vinagre/vinagre.install b/testing/vinagre/vinagre.install
deleted file mode 100644
index 68158ac80..000000000
--- a/testing/vinagre/vinagre.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.91.91-2) < 0 )); then
-    usr/sbin/gconfpkg --uninstall vinagre
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/vino/PKGBUILD b/testing/vino/PKGBUILD
deleted file mode 100644
index b7ee853c9..000000000
--- a/testing/vino/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 139075 2011-09-28 19:33:33Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=vino
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="a VNC server for the GNOME desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils')
-makedepends=('intltool' 'networkmanager')
-groups=('gnome-extra')
-url="http://www.gnome.org"
-options=(!emptydirs)
-install=vino.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2b22737aa84c15b07815d47392f9a6ef4cf6f9410cf7024bbae538496e2eda37')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vino \
-      --localstatedir=/var \
-      --enable-gnome-keyring \
-      --enable-avahi \
-      --disable-http-server
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/vino/vino.install b/testing/vino/vino.install
deleted file mode 100644
index 469266843..000000000
--- a/testing/vino/vino.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall vino
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD
deleted file mode 100644
index 871aa83eb..000000000
--- a/testing/vlc/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 139589 2011-10-03 14:22:44Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
-
-pkgname=vlc
-pkgver=1.1.11
-pkgrel=5
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('GPL')
-depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio'
-         'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa'
-         'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi'
-         'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
-         'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug'
-         'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils')
-makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify'
-             'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev'
-             'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse'
-             'lirc-utils' 'gnutls' 'libcaca')
-optdepends=('avahi: for service discovery using bonjour protocol'
-            'libnotify: for notification plugin'
-            'ncurses: for ncurses interface support'
-            'libdvdcss: for decoding encrypted DVDs'
-            'lirc-utils: for lirc plugin'
-            'libavc1394: for devices using the 1394ta AV/C'
-            'libdc1394: for IEEE 1394 plugin'
-            'kdelibs: KDE Solid hardware integration'
-            'vdpau-video: VDPAU backend for VA API (for GPU acceleration on Nvidia cards)'
-            'libpulse: PulseAudio support')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-backup=('usr/share/vlc/http/.hosts'
-        'usr/share/vlc/http/dialogs/.hosts'
-        'usr/share/vlc/lua/http/.hosts'
-        'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!libtool')
-install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('a64846d6f21ea179ae8e8bfb6f9447fe')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
-
-  ./configure --prefix=/usr \
-              --disable-rpath \
-              --enable-faad \
-              --enable-v4l \
-              --enable-snapshot \
-              --enable-dbus-control \
-              --enable-nls \
-              --enable-lirc \
-              --enable-pvr \
-              --enable-ncurses \
-              --with-live555-tree=/usr/lib/live \
-              --enable-upnp \
-              --enable-realrtsp
-  make
-}
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}/" install
-
-  for res in 16 32 48 128; do
-    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
-        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
-  done
-}
diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install
deleted file mode 100644
index 4a1091bc5..000000000
--- a/testing/vlc/vlc.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    usr/lib/vlc/vlc-cache-gen -f usr/lib/vlc/plugins
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/vlc/plugins/plugins-*.dat
-}
-
-post_remove() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
diff --git a/testing/vte3/PKGBUILD b/testing/vte3/PKGBUILD
deleted file mode 100644
index 72db3aa5b..000000000
--- a/testing/vte3/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 139077 2011-09-28 19:33:35Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=vte3
-pkgname=(vte3 vte-common)
-pkgver=0.30.0
-pkgrel=1
-pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
-arch=('i686' 'x86_64')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-makedepends=('intltool' 'gobject-introspection' 'gtk3')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.30/vte-${pkgver}.tar.xz)
-sha256sums=('4b4e13b46e026f1ba088a5bdf9786a339fedb88438f0e094bc7afe5e376be410')
-
-build() {
-  cd "${srcdir}/vte-${pkgver}"
-  #warning: type-punning to incomplete type might break strict-aliasing rules
-  export CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vte \
-      --localstatedir=/var --disable-static \
-      --enable-introspection
-  make
-}
-
-package_vte3(){
-  depends=('gtk3' 'vte-common')
-  cd "${srcdir}/vte-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper
-}
-
-package_vte-common() {
-  pkgdesc="Common files used by vte and vte3"
-  cd "${srcdir}/vte-${pkgver}"
-
-  make -C gnome-pty-helper DESTDIR="${pkgdir}" install
-}
diff --git a/testing/x264/PKGBUILD b/testing/x264/PKGBUILD
deleted file mode 100644
index e76355a09..000000000
--- a/testing/x264/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 139577 2011-10-03 14:22:28Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=x264
-pkgver=20111001
-pkgrel=1
-pkgdesc="free library for encoding H264/AVC video streams"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/developers/x264.html"
-license=('GPL')
-depends=('glibc')
-makedepends=('yasm')
-source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('dd67dca96ac79e7cb963bfcbf68e017b')
-
-build() {
-    cd "$srcdir/$pkgname-snapshot-$pkgver-2245"
-
-    ./configure --enable-shared
-
-    make
-    make DESTDIR="$pkgdir" \
-      bindir=/usr/bin \
-      libdir=/usr/lib \
-      includedir=/usr/include \
-      install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/xf86-input-acecad/PKGBUILD b/testing/xf86-input-acecad/PKGBUILD
deleted file mode 100644
index 18eae0060..000000000
--- a/testing/xf86-input-acecad/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 136573 2011-08-30 08:46:11Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-acecad
-pkgver=1.5.0
-pkgrel=2
-pkgdesc="X.Org acecad tablet input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('sysfsutils')
-makedepends=('xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-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/testing/xf86-input-acecad/assign-local-private-after-allocating.patch b/testing/xf86-input-acecad/assign-local-private-after-allocating.patch
deleted file mode 100644
index e3e635a6f..000000000
--- a/testing/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/testing/xf86-input-aiptek/PKGBUILD b/testing/xf86-input-aiptek/PKGBUILD
deleted file mode 100644
index 26880ea73..000000000
--- a/testing/xf86-input-aiptek/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 136571 2011-08-30 08:46:10Z jgc $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-aiptek
-pkgver=1.4.1
-pkgrel=2
-pkgdesc="X.Org Aiptek USB Digital Tablet input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-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/testing/xf86-input-evdev/PKGBUILD b/testing/xf86-input-evdev/PKGBUILD
deleted file mode 100644
index b9426643c..000000000
--- a/testing/xf86-input-evdev/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 136569 2011-08-30 08:46:08Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <Alexander@archlinux.org
-
-pkgname=xf86-input-evdev
-pkgver=2.6.0
-pkgrel=4
-pkgdesc="X.org evdev input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-options=('!libtool' '!makeflags')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('fb6f7a6f5168ae07efe890e4ace9fb8af1d4e1e0')
-
-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/testing/xf86-input-joystick/50-joystick.conf b/testing/xf86-input-joystick/50-joystick.conf
deleted file mode 100644
index 95a295ab0..000000000
--- a/testing/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/testing/xf86-input-joystick/PKGBUILD b/testing/xf86-input-joystick/PKGBUILD
deleted file mode 100644
index d76d3a310..000000000
--- a/testing/xf86-input-joystick/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 136567 2011-08-30 08:46:06Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-joystick
-pkgver=1.6.0
-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>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        50-joystick.conf)
-sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780'
-          'e1ff3699a0470c6bb78a53f718df9d8521621e11')
-
-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}/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/testing/xf86-input-keyboard/PKGBUILD b/testing/xf86-input-keyboard/PKGBUILD
deleted file mode 100644
index 9db48647e..000000000
--- a/testing/xf86-input-keyboard/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 136565 2011-08-30 08:46:04Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-keyboard
-pkgver=1.6.0
-pkgrel=3
-pkgdesc="X.Org keyboard input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('8e845086749f8c4b64fdfa852b4b26cf7bb62dc9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-input-mouse/PKGBUILD b/testing/xf86-input-mouse/PKGBUILD
deleted file mode 100644
index ff74c1f26..000000000
--- a/testing/xf86-input-mouse/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 136563 2011-08-30 08:46:02Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-mouse
-pkgver=1.7.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>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('11a6402e82d65bda5fb559c5e9bc72f3fd7af2ed')
-
-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/testing/xf86-input-synaptics/10-synaptics.conf b/testing/xf86-input-synaptics/10-synaptics.conf
deleted file mode 100644
index 81a90fb81..000000000
--- a/testing/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/testing/xf86-input-synaptics/PKGBUILD b/testing/xf86-input-synaptics/PKGBUILD
deleted file mode 100644
index fb9b5836b..000000000
--- a/testing/xf86-input-synaptics/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 137001 2011-09-05 05:55:06Z 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.5.0
-pkgrel=1
-pkgdesc="Synaptics driver for notebook touchpads"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libxtst')
-makedepends=('xorg-server-devel>=1.10.99.902' 'libxi' 'libx11')
-conflicts=('xorg-server<1.10.99.902')
-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)
-sha1sums=('7373c1e3f02bf7e18f71b65762a982d907b4a053'
-          '68e1f4ef5e1038231d210eb422fa4d18c5922f0f')
-
-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/testing/xf86-input-void/PKGBUILD b/testing/xf86-input-void/PKGBUILD
deleted file mode 100644
index cef1f525d..000000000
--- a/testing/xf86-input-void/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 136557 2011-08-30 08:45:57Z jgc $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-void
-pkgver=1.4.0
-pkgrel=2
-pkgdesc="X.org void input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-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/testing/xf86-input-wacom/70-wacom.rules b/testing/xf86-input-wacom/70-wacom.rules
deleted file mode 100644
index f6aa20835..000000000
--- a/testing/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/testing/xf86-input-wacom/PKGBUILD b/testing/xf86-input-wacom/PKGBUILD
deleted file mode 100644
index 502f0f09c..000000000
--- a/testing/xf86-input-wacom/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 136555 2011-08-30 08:45:56Z jgc $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: M Rawash <mrawash@gmail.com>
-
-pkgname=xf86-input-wacom
-pkgver=0.11.1
-pkgrel=3
-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')
-makedepends=('xorg-server-devel>=1.10.99.902' 'libxext' 'libxi')
-conflicts=('xorg-server<1.10.99.902')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        70-wacom.rules)
-md5sums=('0aec4a338cc583ed497b6af68d6d80ab'
-         '10db4f8272286690255c1bcc18bfdd92')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/lib/udev/rules.d"
-  install -m644 "${srcdir}/70-wacom.rules"  "${pkgdir}/lib/udev/rules.d/"
-}
diff --git a/testing/xf86-video-apm/PKGBUILD b/testing/xf86-video-apm/PKGBUILD
deleted file mode 100644
index 01e414018..000000000
--- a/testing/xf86-video-apm/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 136553 2011-08-30 08:45:52Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-apm
-pkgver=1.2.3
-pkgrel=4
-pkgdesc="X.org Alliance ProMotion video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.0')
-conflicts=('xorg-server<1.11.0')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('1fa7180cf985a74132f8d5b39a0bf9df08713fac')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-ark/PKGBUILD b/testing/xf86-video-ark/PKGBUILD
deleted file mode 100644
index 117c18eda..000000000
--- a/testing/xf86-video-ark/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 136551 2011-08-30 08:45:48Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-ark
-pkgver=0.7.3
-pkgrel=4
-pkgdesc="X.org ark video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.0')
-conflicts=('xorg-server<1.11.0')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
-sha1sums=('56901ec6097a83433689f208268281f9c98c238b'
-          'f62cdc7995e9b64c9105382ccfa842732fa81309')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-ark/git-fixes.patch b/testing/xf86-video-ark/git-fixes.patch
deleted file mode 100644
index 2de0f64be..000000000
--- a/testing/xf86-video-ark/git-fixes.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001
-From: Ondrej Zary <linux@rainbow-software.org>
-Date: Sat, 04 Dec 2010 00:23:51 +0000
-Subject: Don't assume that FB address registers are initialized properly
-
-https://bugs.freedesktop.org/show_bug.cgi?id=28249
-
-ark driver does not work with Hercules Stingray 64 card (ark2000pv).
-X fails to start with:
-
-[...]
-(II) ark(0): vgaHWGetIOBase: hwp->IOBase is 0x03d0, hwp->PIOOffset is
-0x0000
-(II) ark(0): Creating default Display subsection in Screen section
-        "Default Screen Section" for depth/fbbpp 24/32
-(==) ark(0): Depth 24, (--) framebuffer bpp 32
-(==) ark(0): RGB weight 888
-(==) ark(0): Default visual is TrueColor
-(**) ark(0): Chipset: "ark2000pv"
-(--) ark(0): Framebuffer @ 0xe5e50000
-(==) ark(0): Using gamma correction (1.0, 1.0, 1.0)
-(--) ark(0): Detected 2048 bytes video ram
-[...]
-Fatal server error:
-AddScreen/ScreenInit failed for driver 0
-
-Comparing with lspci, the framebuffer address is wrong:
-00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00 [VGA controller])
-	Flags: medium devsel
-	Memory at e5000000 (32-bit, prefetchable) [size=4M]
-	[virtual] Expansion ROM at 1c000000 [disabled] [size=64K]
-
-Reviewed-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/ark.h b/src/ark.h
-index de301dc..077f93b 100644
---- a/src/ark.h
-+++ b/src/ark.h
-@@ -34,7 +34,6 @@ typedef struct _ARKRec {
- #endif
- 	EntityInfoPtr		pEnt;
- 	CARD32			IOAddress;
--	CARD32			FBAddress;
- 	unsigned char *		FBBase;
- 	unsigned char *		MMIOBase;
- 	unsigned long		videoRam;
-diff --git a/src/ark_driver.c b/src/ark_driver.c
-index 5de3b9a..fec3e1a 100644
---- a/src/ark_driver.c
-+++ b/src/ark_driver.c
-@@ -363,14 +363,14 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags)
- 	outb(hwp->PIOOffset + hwp->IOBase + 5, tmp & 0x7f);
- 	modinx(hwp->PIOOffset + 0x3c4, 0x1d, 0x01, 0x01);
- 
--	/* use membase's later on ??? */
--	pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) +
--			  (rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24);
--
--	pScrn->memPhysBase = pARK->FBAddress;
-+#ifndef XSERVER_LIBPCIACCESS
-+	pScrn->memPhysBase = pARK->PciInfo->memBase[0];
-+#else
-+	pScrn->memPhysBase = pARK->PciInfo->regions[0].base_addr;
-+#endif
- 
- 	xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n",
--		   (unsigned long)pARK->FBAddress);
-+		   (unsigned long)pScrn->memPhysBase);
- 
- 	if (!xf86SetGamma(pScrn, gzeros))
- 		return FALSE;
-@@ -748,8 +748,13 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	new->sr10 = rdinx(isaIOBase + 0x3c4, 0x10) & ~0x1f;
- 	new->sr10 |= 0x1f;
- 
--	new->sr13 = pARK->FBAddress >> 16;
--	new->sr14 = pARK->FBAddress >> 24;
-+#ifndef XSERVER_LIBPCIACCESS
-+	new->sr13 = pARK->PciInfo->memBase[0] >> 16;
-+	new->sr14 = pARK->PciInfo->memBase[0] >> 24;
-+#else
-+	new->sr13 = pARK->PciInfo->regions[0].base_addr >> 16;
-+	new->sr14 = pARK->PciInfo->regions[0].base_addr >> 24;
-+#endif
- 
- 	new->sr12 = rdinx(isaIOBase + 0x3c4, 0x12) & ~0x03;
- 	switch (pScrn->videoRam) {
-@@ -1022,7 +1027,7 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn)
- 					     pARK->PciTag, 0xb8000, 0x8000);
- 
- 	pARK->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
--				     pARK->PciTag, pARK->FBAddress,
-+				     pARK->PciTag, pARK->PciInfo->memBase[0],
- 				     pScrn->videoRam * 1024);
- #else
- 
-@@ -1032,14 +1037,17 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn)
- 	{
- 		void** result = (void**)&pARK->FBBase;
- 		int err = pci_device_map_range(pARK->PciInfo,
--					       pARK->FBAddress,
-+					       pARK->PciInfo->regions[0].base_addr,
- 					       pScrn->videoRam * 1024,
- 					       PCI_DEV_MAP_FLAG_WRITABLE |
- 					       PCI_DEV_MAP_FLAG_WRITE_COMBINE,
- 					       result);
- 		
--		if (err) 
-+		if (err) {
-+			xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+			   "Cound not map framebuffer: %d\n", err);
- 			return FALSE;
-+		}
- 	}
- #endif
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xf86-video-ast/PKGBUILD b/testing/xf86-video-ast/PKGBUILD
deleted file mode 100644
index 77ab42d9a..000000000
--- a/testing/xf86-video-ast/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 136549 2011-08-30 08:45:45Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-ast
-pkgver=0.93.9
-pkgrel=1
-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>=1.11.0')
-conflicts=('xorg-server<1.11.0')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('424cc93d0300e49a882199c0546425f223b3b4bd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-ati/PKGBUILD b/testing/xf86-video-ati/PKGBUILD
deleted file mode 100644
index 129bf57ee..000000000
--- a/testing/xf86-video-ati/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 136547 2011-08-30 08:45:41Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-ati
-pkgver=6.14.2
-pkgrel=2
-pkgdesc="X.org ati video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=(libpciaccess libdrm udev pixman ati-dri)
-makedepends=('xorg-server-devel>=1.11.0' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
-conflicts=('xorg-server<1.11.0')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('2733b3c126ad9e082ea18b7e7663d6d87fce4d49')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make "DESTDIR=${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-chips/PKGBUILD b/testing/xf86-video-chips/PKGBUILD
deleted file mode 100644
index 2195eb57b..000000000
--- a/testing/xf86-video-chips/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 136545 2011-08-30 08:45:37Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-chips
-pkgver=1.2.4
-pkgrel=3
-pkgdesc="X.org Chips and Technologies video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=(glibc)
-makedepends=('xorg-server-devel>=1.11.0')
-conflicts=('xorg-server<1.11.0')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        gut-overlay-8-16-support-from-driver.patch)
-sha1sums=('71f474335d05f93b2451a7a0750c4409669641a4'
-          'f6a635196118dacb73fad980571b390849963b3d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/gut-overlay-8-16-support-from-driver.patch"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch b/testing/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch
deleted file mode 100644
index b9c832238..000000000
--- a/testing/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch
+++ /dev/null
@@ -1,580 +0,0 @@
-From e4bd864898fd276a62dac05cdfff394e98434f02 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Tue, 29 Mar 2011 03:53:31 +0000
-Subject: chips: gut the overlay 8/16 support from driver.
-
-This driver is for chips that were bought by Intel in 1997,
-this feature means maintaining a lot of code in the X server
-for little gain.
-
-Drop it like its hot.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-Reviewed-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/man/chips.man b/man/chips.man
-index 740af38..0c022ee 100644
---- a/man/chips.man
-+++ b/man/chips.man
-@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off
- Force driver to leave centering and stretching registers alone. This
- can fix some laptop suspend/resume problems. Default: off
- .TP
--.BI "Option \*qOverlay\*q"
--Enable 8+24 overlay mode.  Only appropriate for depth 24.  Default: off.
--.TP
- .BI "Option \*qColorKey\*q \*q" integer \*q
- Set the colormap index used for the transparency key for the depth 8 plane
- when operating in 8+16 overlay mode.  The value must be in the range
-diff --git a/src/ct_accel.c b/src/ct_accel.c
-index 3920b0a..4b5776a 100644
---- a/src/ct_accel.c
-+++ b/src/ct_accel.c
-@@ -428,19 +428,7 @@ chips_imagewrite:
-         infoPtr->ImageWriteFlags |= NO_PLANEMASK;
- #endif
- 
--
--#ifdef CHIPS_HIQV
--    if (XAAInit(pScreen, infoPtr)) {
--	if (cPtr->Flags & ChipsOverlay8plus16)      
--	    return(XAAInitDualFramebufferOverlay(pScreen,
--						 CTNAME(DepthChange)));
--	else
--	    return TRUE;
--    } else
--	return FALSE;
--#else
-     return(XAAInit(pScreen, infoPtr));
--#endif
- }
- 
- #ifdef CHIPS_HIQV
-@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn,
- #endif
-     w *= cAcl->BytesPerPixel;
-     ctBLTWAIT;
--#ifdef CHIPS_HIQV
--    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) &&
--	    (pScrn->depth == 8))
--	ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes);
--#endif
-     ctSETSRCADDR(srcaddr);
-     ctSETDSTADDR(destaddr);
- #ifdef CHIPS_HIQV
-@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
-     patternaddr = (paty * pScrn->displayWidth + 
- 		   (patx & ~0x3F)) * cAcl->BytesPerPixel;
-     cAcl->patternyrot = (patx & 0x3F) >> 3;
--#ifdef CHIPS_HIQV
--    if (cPtr->Flags & ChipsOverlay8plus16)
--	patternaddr += cPtr->FbOffset16;
--#endif
- 
-     ctBLTWAIT;
-     ctSETPATSRCADDR(patternaddr);
-@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
- 
- #ifdef CHIPS_HIQV
-     patternaddr = paty * pScrn->displayWidth + patx;
--    if (cPtr->Flags & ChipsOverlay8plus16)
--	patternaddr = patternaddr * 2 + cPtr->FbOffset16;
--    else
--	patternaddr *= cAcl->BytesPerPixel;
-+    patternaddr *= cAcl->BytesPerPixel;
- #else
-     patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel;
- #endif
-@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
-     dwords = (((skipleft  + bytesPerLine + 0x7) & ~0x7)) >> 2;
-     destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
-     destpitch = pScrn->displayWidth * (bpp >> 3);
--    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	destaddr += cPtr->FbOffset16;
--    else
--	destaddr += cAcl->FbOffset;
-+    destaddr += cAcl->FbOffset;
- 
-     ctBLTWAIT;
- 
-@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
- 	y++;
- 
- 	destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
--	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	    destaddr += cPtr->FbOffset16;
--	else
--	    destaddr += cAcl->FbOffset;
-+	destaddr += cAcl->FbOffset;
- 
- 	ctBLTWAIT;
- 	ctSETDSTADDR(destaddr);
-@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
-     dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2;
-     srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
-     srcpitch = pScrn->displayWidth * (bpp >> 3);
--    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	srcaddr += cPtr->FbOffset16;
--    else
--	srcaddr += cAcl->FbOffset;
-+    srcaddr += cAcl->FbOffset;
- 
-     ctBLTWAIT;
-     ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM | 
-@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
- 	dst += dstwidth;
- 	y++;
- 	srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
--	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
--	    srcaddr += cPtr->FbOffset16;
--	else
--	    srcaddr += cAcl->FbOffset;
-+	srcaddr += cAcl->FbOffset;
- 	ctBLTWAIT;
- 	ctSETSRCADDR(srcaddr);
- 	ctSETHEIGHTWIDTHGO(h, bytesPerLine);
-diff --git a/src/ct_driver.c b/src/ct_driver.c
-index 6624b79..08df050 100644
---- a/src/ct_driver.c
-+++ b/src/ct_driver.c
-@@ -1639,55 +1639,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
- 	}
-     }
-     
--    if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) {
--	if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) {
--	  if (pScrn->bitsPerPixel == 16) {
--	    if (cPtr->Flags & ChipsLinearSupport) {
--		cPtr->Flags |= ChipsOverlay8plus16;
--		if(!xf86GetOptValInteger(
--			cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey)))
--		    pScrn->colorKey = TRANSPARENCY_KEY;
--		pScrn->overlayFlags = OVERLAY_8_16_DUALFB;
--		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
--			   "PseudoColor overlay enabled.\n");
--		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH))
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--			   "                             - Forcing option \"Stretch\" \"ON\".\n");
--		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER))
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--			   "                             - Forcing option \"LcdCenter\" \"OFF\".\n");
--		if (cPtr->Flags & ChipsShadowFB) {
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
--		           "                             - Disabling \"Shadow Framebuffer\".\n");
--		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--			   "                               Not support with option \"8Plus16\".\n");
--		    cPtr->Flags &= ~ChipsShadowFB;
--		    cPtr->Rotate = 0;
--		}
--	    } else {
--		xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n");
--	    }
--	  } else {
--	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--		"Option \"Overlay\" is not supported in this configuration\n");
--	  }
--	} else {
--	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
--		"\"%s\" is not a valid value for Option \"Overlay\"\n", s); 
--	}
--    }
--
--    if (!(cPtr->Flags & ChipsOverlay8plus16)) {
--	if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
--		&(cPtr->videoKey))) {
--	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
-+    if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
-+	&(cPtr->videoKey))) {
-+         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
- 		cPtr->videoKey);
--	} else {
--	    cPtr->videoKey =  (1 << pScrn->offset.red) | 
-+    } else {
-+       cPtr->videoKey =  (1 << pScrn->offset.red) | 
- 			(1 << pScrn->offset.green) |
- 			(((pScrn->mask.blue >> pScrn->offset.blue) - 1)
- 			<< pScrn->offset.blue); 
--	}
-     }
- 
-     if (cPtr->Flags & ChipsShadowFB) {
-@@ -2335,28 +2295,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
-     /* and 32bits on the others. Thus multiply by a suitable factor      */  
-     if (cPtr->Flags & Chips64BitMemory) {
- 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
--	    if (cPtr->Flags & ChipsOverlay8plus16 )
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock,
- 			     MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1));
- 	else
--	    if (cPtr->Flags & ChipsOverlay8plus16)
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock, 
- 			     MemClk->Clk * 8 * 0.7 / bytesPerPixel);
-     } else {
- 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
--	    if (cPtr->Flags & ChipsOverlay8plus16 )
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock,
- 			     MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1));
- 	else
--	    if (cPtr->Flags & ChipsOverlay8plus16)
--		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3);
--	    else
- 		cPtr->MaxClock = min(cPtr->MaxClock, 
- 			     MemClk->Clk * 4 * 0.7 / bytesPerPixel);
-     }
-@@ -3736,8 +3684,7 @@ CHIPSEnterVT(int scrnIndex, int flags)
-     /* Should we re-save the text mode on each VT enter? */
-     if(!chipsModeInit(pScrn, pScrn->currentMode))
-       return FALSE;
--    if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
--	&& (cPtr->Flags & ChipsVideoSupport)
-+    if ((cPtr->Flags & ChipsVideoSupport)
- 	&& (cPtr->Flags & ChipsLinearSupport)) 
-         CHIPSResetVideo(pScrn); 
- 
-@@ -3788,8 +3735,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
-     int i, index, shift ;
-     CHIPSEntPtr cPtrEnt;    
- 
--    shift = ((pScrn->depth == 15) && 
--	     (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0;
-+    shift = (pScrn->depth == 15) ? 3 : 0;
- 
-     if (cPtr->UseDualChannel) {
-         cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0],
-@@ -3895,18 +3841,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices,
-     hwp->disablePalette(hwp);
- }
- 
--static Bool
--cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
--                  int xsize, int ysize, int dpix, int dpiy,
--                  int width16, int width8)
--{
--    return
--        (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize,
--                              dpix, dpiy, width16, width8, 16, 8) &&
--         fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize,
--                                   dpix, dpiy, width16, width8, 16, 8, 16, 8));
--}
--
- /* Mandatory */
- static Bool
- CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-@@ -3947,22 +3881,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     if (!chipsMapMem(pScrn))
- 	return FALSE;
- 
--    /* Setup a pointer to the overlay if needed */
--    if (cPtr->Flags & ChipsOverlay8plus16) {
--	cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY;
--	cPtr->FbSize16 =  (pScrn->displayWidth << 1) * pScrn->virtualY;
--	if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) {
--	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
--		   "Too little memory for overlay. Disabling.\n");
--	    cPtr->Flags &= ~ChipsOverlay8plus16;
--	}
--	if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) {
--	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
--		   "Max overlay Width/Height 1024 pixels. Disabling.\n");
--	    cPtr->Flags &= ~ChipsOverlay8plus16;
--	}
--    }
--
-     /* Setup the MMIO register access functions if need */
-     if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) {
- 	CHIPSSetMmioExtFuncs(cPtr);
-@@ -4035,18 +3953,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     miClearVisualTypes();
- 
-     /* Setup the visuals we support. */
--    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){
--	if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask,
--			      pScrn->rgbBits, PseudoColor))
--		return FALSE;
--	if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor))
--		return FALSE;
--    } else {
--      if (!miSetVisualTypes(pScrn->depth,
-+    if (!miSetVisualTypes(pScrn->depth,
- 			    miGetDefaultVisualMask(pScrn->depth),
- 			    pScrn->rgbBits, pScrn->defaultVisual))
--	return FALSE;
--    }
-+        return FALSE;
-     miSetPixmapDepths ();
- 
-     /*
-@@ -4090,13 +4000,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	break;
- #endif
-     case 16:
--      if (cPtr->Flags & ChipsOverlay8plus16) {
--	  ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + 
--				  cPtr->FbOffset16, FBStart, width, 
--				  height, pScrn->xDpi, pScrn->yDpi,
--				  displayWidth, displayWidth);
--	  break;
--      }
-     default:
- 	ret = fbScreenInit(pScreen, FBStart,
-  		        width,height,
-@@ -4244,9 +4147,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	if (pScrn->bitsPerPixel < 8)
- 	    freespace = allocatebase - pScrn->displayWidth * 
- 		    pScrn->virtualY / 2;
--	else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16))
--	    freespace = allocatebase - pScrn->displayWidth * 
--		    pScrn->virtualY - cPtr->FbSize16;
- 	else	
- 	    freespace = allocatebase - pScrn->displayWidth * 
- 		    pScrn->virtualY * (pScrn->bitsPerPixel >> 3);
-@@ -4369,9 +4269,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	    AvailFBArea.y2 = cAcl->CacheEnd /
- 		(pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
- 
--	    if (!(cPtr->Flags & ChipsOverlay8plus16)) {     
--		xf86InitFBManager(pScreen, &AvailFBArea); 
--	    }
-+	    xf86InitFBManager(pScreen, &AvailFBArea); 
- 	}
- 	if (cPtr->Flags & ChipsAccelSupport) {
- 	    if (IS_HiQV(cPtr)) {
-@@ -4425,16 +4323,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     if (!miCreateDefColormap(pScreen))
- 	return FALSE;
-     
--    if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) {
--	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette,
--		NULL, CMAP_RELOAD_ON_MODE_SWITCH))
--	    return FALSE;
--    } else {
--	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
-+    if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
- 		(pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette),
- 		NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR))
--	    return FALSE;
--    }
-+	return FALSE;
-     
- #ifndef XSERVER_LIBPCIACCESS
-     racflag = RAC_COLORMAP;
-@@ -4448,8 +4340,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 	xf86SetSilkenMouse(pScreen);
- #endif
- 
--	if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
--	    && (cPtr->Flags & ChipsVideoSupport)
-+	if ((cPtr->Flags & ChipsVideoSupport)
- 	    && (cPtr->Flags & ChipsLinearSupport)) {
- 	    CHIPSInitVideo(pScreen);
-     }
-@@ -4522,10 +4413,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
- 	Base >>= 3;
- 	break;
-     case 16:
--	if (!(cPtr->Flags & ChipsOverlay8plus16))
--	   Base >>= 1;
--	else
--	   Base >>= 2;
-+	Base >>= 1;
- 	break;
-     case 24:
- 	if (!IS_HiQV(cPtr))
-@@ -4581,14 +4469,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
- 	cPtr->writeMSS(cPtr, hwp, MSS);
-     }
- 
--    if (cPtr->Flags & ChipsOverlay8plus16) {
--	Base = (Base << 3) & ~(unsigned long)0xF;
--
--	cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8);
--	cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF);
--	cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF);
--    }
--
- }
- 
- /* Mandatory */
-@@ -4652,13 +4532,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
-     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-     CHIPSPtr cPtr = CHIPSPTR(pScrn);
- 
--    if (flags & MODECHECK_FINAL) {
--    /* Don't subtract FrambufferSize here as it should be subtracted already */
--    if ((cPtr->Flags & ChipsOverlay8plus16) 
--      && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY 
--	  < 0))
--	return MODE_MEM;
--    }
-     /* The tests here need to be expanded */
-     if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD))
- 	return MODE_NO_INTERLACE;
-@@ -5544,12 +5417,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     } else {
- 	ChipsStd->Attribute[0x10] = 0x01;   /* mode */
-     }
--    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) {
--	/* Make sure that the overlay isn't visible in the overscan region */
--	if (ChipsStd->Attribute[0x11] == pScrn->colorKey)
--	    ChipsStd->Attribute[0x11] = pScrn->colorKey - 1;
--    } else
--	ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
-+    ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
-     ChipsStd->Attribute[0x12] = 0x0F;   /* enable all color planes */
-     ChipsStd->Attribute[0x13] = 0x00;   /* horiz pixel panning 0 */
- 
-@@ -5558,8 +5426,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     /* set virtual screen width */
-     tmp = pScrn->displayWidth >> 3;
-     if (pScrn->bitsPerPixel == 16) {
--	if (!(cPtr->Flags & ChipsOverlay8plus16))
--	    tmp <<= 1;		       /* double the width of the buffer */
-+	tmp <<= 1;		       /* double the width of the buffer */
-     } else if (pScrn->bitsPerPixel == 24) {
- 	tmp += tmp << 1;
-     } else if (pScrn->bitsPerPixel == 32) {
-@@ -5688,8 +5555,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 
-     /* centering/stretching */
-     if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) {
--	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) ||
--	(cPtr->Flags & ChipsOverlay8plus16)) {
-+	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) {
- 	    ChipsNew->FR[0x40] &= 0xDF;    /* Disable Horizontal stretching */
- 	    ChipsNew->FR[0x48] &= 0xFB;    /* Disable vertical stretching */
- 	    ChipsNew->XR[0xA0] = 0x10;     /* Disable cursor stretching */
-@@ -5709,8 +5575,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	}
-     }
- 
--    if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE))
--		|| (cPtr->Flags & ChipsOverlay8plus16)) {
-+    if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) {
- 	ChipsNew->FR[0x40] |= 0x3;    /* Enable Horizontal centering */
- 	ChipsNew->FR[0x48] |= 0x3;    /* Enable Vertical centering */
-     } else {
-@@ -5723,8 +5588,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
- 	ChipsNew->XR[0x82] |=0x02;
- 
-     /* software mode flag */
--    ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ?
--	8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
-+    ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
- 	min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) :
- 	mode->CrtcHDisplay, mode->CrtcVDisplay);
- #ifdef DEBUG
-@@ -5762,7 +5626,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     	}
-     }	    
-     /* bpp depend */
--    if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) {
-+    if (pScrn->bitsPerPixel == 16) {
- 	ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4;
- 	if (cPtr->Flags & ChipsGammaSupport)
- 	    ChipsNew->XR[0x82] |= 0x0C;
-@@ -5915,60 +5779,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
-     /* Turn off multimedia by default as it degrades performance */
-     ChipsNew->XR[0xD0] &= 0x0f;	 
-     
--    /* Setup the video/overlay */
--    if (cPtr->Flags & ChipsOverlay8plus16) {
--	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
--#ifdef SAR04
--	ChipsNew->XR[0x4F] = 0x2A;	/* SAR04 >352 pixel overlay width */
--#endif
--	ChipsNew->MR[0x1E] &= 0xE0;	/* Set Zoom and Direction */
--	if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE))
--	    ChipsNew->MR[0x1E] |= 0x10;	/* Interlace */
--	ChipsNew->MR[0x1F] &= 0x14;	/* Mask reserved bits */
--	ChipsNew->MR[0x1F] |= 0x08;	/* RGB 16bpp */
--	if (pScrn->weight.green == 5)
--	    ChipsNew->MR[0x1F] |= 0x01;	/* RGB 15bpp */
--
--	ChipsNew->MR[0x20] &= 0x03;	/* Mask reserved bits */
--	ChipsNew->MR[0x20] |= 0x80;	/* Auto Centre, Use mem ptr1 */
--	ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 1 */
--	ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF;
--	ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF;
--	ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 2 */
--	ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF;
--	ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF;
--	ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ 
--	ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1;
--
--	/* Left Edge of Overlay */
--	ChipsNew->MR[0x2A] = cPtr->OverlaySkewX;
--	ChipsNew->MR[0x2B] &= 0xF8;	/* Mask reserved bits */
--	ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7);
--	/* Right Edge of Overlay */
--	ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - 
--							1) & 0xFF;
--	ChipsNew->MR[0x2D] &= 0xF8;	/* Mask reserved bits */
--	ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth -
--							1) >> 8) & 0x07;
--	/* Top Edge of Overlay */
--	ChipsNew->MR[0x2E] = cPtr->OverlaySkewY;
--	ChipsNew->MR[0x2F] &= 0xF8;
--	ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7);
--	/* Bottom Edge of Overlay*/
--	ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF;
--	ChipsNew->MR[0x31] &= 0xF8;	/* Mask reserved bits */
--	ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY - 
--							1 ) >> 8) & 0x07;
--
--	ChipsNew->MR[0x3C] &= 0x18;	/* Mask reserved bits */
--	ChipsNew->MR[0x3C] |= 0x07;	/* Enable keyed overlay window */
--	ChipsNew->MR[0x3D] = 0x00;
--	ChipsNew->MR[0x3E] = 0x00;
--	ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */
--	ChipsNew->MR[0x40] = 0xFF;
--	ChipsNew->MR[0x41] = 0xFF;
--	ChipsNew->MR[0x42] = 0x00;
--    } else if (cPtr->Flags & ChipsVideoSupport) {
-+    if (cPtr->Flags & ChipsVideoSupport) {
- #if 0   /* if we do this even though video isn't playing we kill performance */
- 	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
- #endif
-@@ -6877,8 +6688,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs)
- 	}
- 
- 	/* Set SAR04 multimedia register correctly */
--	if ((cPtr->Flags & ChipsOverlay8plus16)
--	    || (cPtr->Flags & ChipsVideoSupport)) {
-+	if ((cPtr->Flags & ChipsVideoSupport)) {
- #ifdef SAR04
- 	    cPtr->writeXR(cPtr, 0x4E, 0x04);
- 	    if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F])
-diff --git a/src/ct_driver.h b/src/ct_driver.h
-index d8ce228..10a24d4 100644
---- a/src/ct_driver.h
-+++ b/src/ct_driver.h
-@@ -114,7 +114,6 @@ typedef struct {
- /* Options flags for the C&T chipsets */
- #define ChipsHWCursor		0x00001000
- #define ChipsShadowFB		0x00002000
--#define ChipsOverlay8plus16	0x00004000
- #define ChipsUseNewFB		0x00008000
- 
- /* Architecture type flags */
-diff --git a/src/ct_video.c b/src/ct_video.c
-index a68acb9..c9e5bb4 100644
---- a/src/ct_video.c
-+++ b/src/ct_video.c
-@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen)
-     CHIPSPtr cPtr = CHIPSPTR(pScrn);
-     int num_adaptors;
- 	
--    if (!(cPtr->Flags & ChipsOverlay8plus16) &&
--       (cPtr->Flags & ChipsVideoSupport)) {
-+    if ((cPtr->Flags & ChipsVideoSupport)) {
- 	newAdaptor = CHIPSSetupImageVideo(pScreen);
- 	CHIPSInitOffscreenImages(pScreen);
-     }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xf86-video-cirrus/PKGBUILD b/testing/xf86-video-cirrus/PKGBUILD
deleted file mode 100644
index 07d5b5cd6..000000000
--- a/testing/xf86-video-cirrus/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 136543 2011-08-30 08:45:35Z jgc $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-cirrus
-pkgver=1.3.2
-pkgrel=7
-pkgdesc="X.org Cirrus Logic video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('8195d03ed0be0975c03441e66a9f53b3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-dummy/PKGBUILD b/testing/xf86-video-dummy/PKGBUILD
deleted file mode 100644
index 419630bee..000000000
--- a/testing/xf86-video-dummy/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 136541 2011-08-30 08:45:33Z jgc $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-dummy
-pkgver=0.3.4
-pkgrel=5
-pkgdesc="X.org dummy video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902' 'xf86dgaproto')
-conflicts=('xorg-server<1.10.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('876ed7165ea2821bbddd73232a1ce0b79c1f14ff')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-fbdev/PKGBUILD b/testing/xf86-video-fbdev/PKGBUILD
deleted file mode 100644
index ff6be497a..000000000
--- a/testing/xf86-video-fbdev/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 136539 2011-08-30 08:45:31Z jgc $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-fbdev
-pkgver=0.4.2
-pkgrel=5
-pkgdesc="X.org framebuffer video driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('c8562f997d56c9fec50df6ca9892f39f43ff4c2c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-glint/PKGBUILD b/testing/xf86-video-glint/PKGBUILD
deleted file mode 100644
index 1748502dc..000000000
--- a/testing/xf86-video-glint/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 137326 2011-09-07 07:33:15Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-glint
-pkgver=1.2.6
-pkgrel=1
-pkgdesc="X.org GLINT/Permedia video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto')
-conflicts=('xorg-server<1.11.0')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-i128/PKGBUILD b/testing/xf86-video-i128/PKGBUILD
deleted file mode 100644
index 1cb3e70cb..000000000
--- a/testing/xf86-video-i128/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 136535 2011-08-30 08:45:28Z jgc $
-# Maintainer:Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-i128
-pkgver=1.3.4
-pkgrel=4
-pkgdesc="X.org Number 9 I128 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('d5f755dc964eaa067b4efcafafd00814a60df775')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-i740/PKGBUILD b/testing/xf86-video-i740/PKGBUILD
deleted file mode 100644
index e734e2a71..000000000
--- a/testing/xf86-video-i740/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 136533 2011-08-30 08:45:27Z jgc $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-i740
-pkgver=1.3.2
-pkgrel=7
-pkgdesc="X.org Intel i740 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('aadd2168153f780c487778e5fdda5473ed4b243d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-intel/PKGBUILD b/testing/xf86-video-intel/PKGBUILD
deleted file mode 100644
index d9c31f26e..000000000
--- a/testing/xf86-video-intel/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 136531 2011-08-30 08:45:25Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.16.0
-pkgrel=1
-pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev)
-makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender')
-conflicts=('xorg-server<1.10.99.902' 'xf86-video-i810' 'xf86-video-intel-legacy')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('53441ea4d4335b501d32809b6b92593cbb1f79cf')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-mach64/PKGBUILD b/testing/xf86-video-mach64/PKGBUILD
deleted file mode 100644
index a43bf7851..000000000
--- a/testing/xf86-video-mach64/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 136529 2011-08-30 08:45:23Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-mach64
-pkgver=6.9.0
-pkgrel=2
-pkgdesc="X.org mach64 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc' 'mach64-dri')
-makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
-conflicts=('xorg-server<1.10.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('95a7ec9761fe11dadbcd9078c55148198a91b2f1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-mga/PKGBUILD b/testing/xf86-video-mga/PKGBUILD
deleted file mode 100644
index ac39c320a..000000000
--- a/testing/xf86-video-mga/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 136527 2011-08-30 08:45:22Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-mga
-pkgver=1.4.13
-pkgrel=4
-pkgdesc="X.org mga video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc' 'mga-dri')
-makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
-conflicts=('xorg-server<1.10.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
-sha1sums=('55aa185cf381def4b5905c8b93694b8dfbd5c378'
-          '74782a39533ef475bd02b8b4645775879494e568')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr --enable-dri
-  make
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-neomagic/PKGBUILD b/testing/xf86-video-neomagic/PKGBUILD
deleted file mode 100644
index be44b54fb..000000000
--- a/testing/xf86-video-neomagic/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 136525 2011-08-30 08:45:20Z jgc $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-neomagic
-pkgver=1.2.5
-pkgrel=5
-pkgdesc="X.org neomagic video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto')
-conflicts=('xorg-server<1.11.0')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-nouveau/PKGBUILD b/testing/xf86-video-nouveau/PKGBUILD
deleted file mode 100644
index 064334ea2..000000000
--- a/testing/xf86-video-nouveau/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 136523 2011-08-30 08:45:18Z jgc $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: buddabrod <buddabrod@gmail.com>
-
-pkgname=xf86-video-nouveau
-_gitdate=20110829
-pkgver=0.0.16_git${_gitdate} # see configure.ac
-pkgrel=1
-pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)"
-arch=('i686' 'x86_64')
-url="http://nouveau.freedesktop.org/wiki/"
-license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop.org/wiki/FAQ#head-09f75d03eb30011c754038a3893119a70745de4e
-depends=('libdrm' 'udev')
-optdepends=('nouveau-dri:	experimental gallium3d features')
-makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto')
-conflicts=('xorg-server<1.11.0')
-options=('!libtool')
-install=${pkgname}.install
-source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
-md5sums=('8f484f6602a3711f4adfbce74fd886c1')
-
-# source PKGBUILD && mksource
-mksource() {
-	mkdir /tmp/${pkgname}-${_gitdate}
-	pushd /tmp/${pkgname}-${_gitdate}
-	git clone -v --depth 1 git://anongit.freedesktop.org/nouveau/xf86-video-nouveau
-	cd xf86-video-nouveau
-	git archive --prefix=xf86-video-nouveau-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2
-	popd
-}
-
-build() {
-  cd ${srcdir}/xf86-video-nouveau-${_gitdate}
-  ./autogen.sh --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/xf86-video-nouveau-${_gitdate}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/xf86-video-nouveau/xf86-video-nouveau.install b/testing/xf86-video-nouveau/xf86-video-nouveau.install
deleted file mode 100644
index 027154ff3..000000000
--- a/testing/xf86-video-nouveau/xf86-video-nouveau.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install () {
-   cat << _EOF
-  ==> make sure you use KernelModeSetting (KMS)
-  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
-_EOF
-}
-
-post_upgrade() {
-  if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then
-    cat << _EOF
-  ==> ATTENTION: Usermode support has been dropped
-  ==> make sure you use KernelModeSetting (KMS)
-  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
-_EOF
- fi
-}
diff --git a/testing/xf86-video-nv/PKGBUILD b/testing/xf86-video-nv/PKGBUILD
deleted file mode 100644
index 33edd1b69..000000000
--- a/testing/xf86-video-nv/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 136521 2011-08-30 08:45:17Z jgc $
-# Maintainer:Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-nv
-pkgver=2.1.18
-pkgrel=4
-pkgdesc="X.org nv video driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.0')
-conflicts=('xorg-server<1.11.0')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('d35b2fa5a26a507a9cc95b69243d9fd0c0f32aa2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-openchrome/PKGBUILD b/testing/xf86-video-openchrome/PKGBUILD
deleted file mode 100644
index 9adff65cf..000000000
--- a/testing/xf86-video-openchrome/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 136519 2011-08-30 08:45:15Z jgc $
-# Contributor: Paul Mattal <paul@mattal.com>
-# Maintainer: Juergen Hoetzel <juergen@hoetzel.info>
-
-pkgname=xf86-video-openchrome
-pkgver=0.2.904
-_svnver=r933
-pkgrel=6
-pkgdesc="X.Org Openchrome drivers"
-arch=(i686 x86_64)
-license=('custom')
-url="http://www.openchrome.org"
-depends=('libdrm' 'libxvmc' 'unichrome-dri')
-makedepends=('xorg-server-devel>=1.11.0' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc' 'glproto')
-replaces=('openchrome' 'xf86-video-via')
-options=('!libtool' '!makeflags')
-conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.11.0')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-${_svnver}.tar.bz2)
-md5sums=('d661460276a31d3d012d8cdb1a0a73c1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-r128/PKGBUILD b/testing/xf86-video-r128/PKGBUILD
deleted file mode 100644
index 5f2b6d0da..000000000
--- a/testing/xf86-video-r128/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 136517 2011-08-30 08:45:13Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-r128
-pkgver=6.8.1
-pkgrel=7
-pkgdesc="X.org ati Rage128 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc' 'r128-dri')
-makedepends=('xorg-server-devel>=1.11.0' 'xf86driproto' 'libdrm' 'mesa' 'glproto')
-conflicts=('xorg-server<1.11.0')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
-md5sums=('2b90854a62a4d45d652062f582dc8d13'
-         '3937776d4427861d0797e47119ac327d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-
-  autoreconf -fi
-  ./configure --prefix=/usr  --enable-dri
-  make
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-r128/git-fixes.patch b/testing/xf86-video-r128/git-fixes.patch
deleted file mode 100644
index 933e8fb2a..000000000
--- a/testing/xf86-video-r128/git-fixes.patch
+++ /dev/null
@@ -1,842 +0,0 @@
-diff --git a/COPYING b/COPYING
-index 7f33cbf..05bcb74 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,91 @@
--This is a stub file.  This package has not yet had its complete licensing
--information compiled.  Please see the individual source files for details on
--your rights to use and modify this software.
-+Copyright 2007 George Sapountzis
- 
--Please submit updated COPYING files to the Xorg bugzilla:
-+Permission is hereby granted, free of charge, to any person obtaining a
-+copy of this software and associated documentation files (the "Software"),
-+to deal in the Software without restriction, including without limitation
-+the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following conditions:
- 
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-+The above copyright notice and this permission notice (including the next
-+paragraph) shall be included in all copies or substantial portions of the
-+Software.
- 
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
-+
-+Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario,
-+                     Precision Insight, Inc., Cedar Park, Texas, and
-+                     VA Linux Systems Inc., Fremont, California.
-+
-+All Rights Reserved.
-+
-+Permission is hereby granted, free of charge, to any person obtaining
-+a copy of this software and associated documentation files (the
-+"Software"), to deal in the Software without restriction, including
-+without limitation on the rights to use, copy, modify, merge,
-+publish, distribute, sublicense, and/or sell copies of the Software,
-+and to permit persons to whom the Software is furnished to do so,
-+subject to the following conditions:
-+
-+The above copyright notice and this permission notice (including the
-+next paragraph) shall be included in all copies or substantial
-+portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+NON-INFRINGEMENT.  IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX
-+SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+OTHER DEALINGS IN THE SOFTWARE.
-+
-+Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas.
-+Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas.
-+All Rights Reserved.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a
-+copy of this software and associated documentation files (the "Software"),
-+to deal in the Software without restriction, including without limitation
-+the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice (including the next
-+paragraph) shall be included in all copies or substantial portions of the
-+Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+DEALINGS IN THE SOFTWARE.
-+
-+Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
-+
-+Permission to use, copy, modify, distribute, and sell this software and its
-+documentation for any purpose is hereby granted without fee, provided that
-+the above copyright notice appear in all copies and that both that copyright
-+notice and this permission notice appear in supporting documentation, and
-+that the name of Marc Aurele La France not be used in advertising or
-+publicity pertaining to distribution of the software without specific,
-+written prior permission.  Marc Aurele La France makes no representations
-+about the suitability of this software for any purpose.  It is provided
-+"as-is" without express or implied warranty.
-+
-+MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.  IN NO
-+EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+PERFORMANCE OF THIS SOFTWARE.
- 
--http://lists.freedesktop.org/mailman/listinfo/xorg
-diff --git a/Makefile.am b/Makefile.am
-index 1f4c3c4..4c278ba 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,21 +18,15 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--AUTOMAKE_OPTIONS = foreign
- SUBDIRS = src man
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
- 
--if BUILD_LINUXDOC
--README.r128: README.r128.sgml
--	$(MAKE_TEXT) README.r128.sgml && mv README.r128.txt README.r128
-+.PHONY: ChangeLog INSTALL
- 
--endif
--
--EXTRA_DIST = README.r128 README.r128.sgml ChangeLog
--CLEANFILES = ChangeLog
--
--.PHONY: ChangeLog
-+INSTALL:
-+	$(INSTALL_CMD)
- 
- ChangeLog:
- 	$(CHANGELOG_CMD)
- 
--dist-hook: ChangeLog
-+dist-hook: ChangeLog INSTALL
-diff --git a/README b/README
-index cb61870..5c6f59d 100644
---- a/README
-+++ b/README
-@@ -1,4 +1,161 @@
--xf86-video-r128 - ATI Rage 128 video driver for the Xorg X server
-+  Information for ATI Rage 128 Users
-+  Precision Insight, Inc., SuSE GmbH
-+  13 June 2000
-+  ____________________________________________________________
-+
-+  Table of Contents
-+
-+
-+  1. Supported Hardware
-+  2. Features
-+  3. Technical Notes
-+  4. Reported Working Video Cards
-+  5. Configuration
-+  6. Driver Options
-+  7. Known Limitations
-+  8. Authors
-+
-+
-+  ______________________________________________________________________
-+
-+  1.  Supported Hardware
-+
-+
-+  o  ATI Rage 128 based cards
-+
-+
-+
-+  2.  Features
-+
-+
-+  o  Full support (including hardware accelerated 2D drawing) for 8, 15,
-+     16, 24 bit pixel depths.
-+
-+  o  Hardware cursor support to reduce sprite flicker.
-+
-+  o  Support for high resolution video modes up to 1800x1440 @ 70Hz.
-+
-+  o  Support for doublescan video modes (e.g., 320x200 and 320x240).
-+
-+  o  Support for gamma correction at all pixel depths.
-+
-+  o  Fully programmable clock supported.
-+
-+  o  Robust text mode restore for VT switching.
-+
-+
-+
-+  3.  Technical Notes
-+
-+
-+  o  None
-+
-+
-+
-+  4.  Reported Working Video Cards
-+
-+
-+  o  Rage Fury AGP 32MB
-+
-+  o  XPERT 128 AGP 16MB
-+
-+  o  XPERT 99 AGP 8MB
-+
-+
-+
-+  5.  Configuration
-+
-+  The driver auto-detects all device information necessary to initialize
-+  the card. The only lines you need in the "Device" section of your
-+  xorg.conf file are:
-+
-+         Section "Device"
-+             Identifier "Rage 128"
-+             Driver     "r128"
-+         EndSection
-+
-+
-+  or let xorgconfig do this for you.
-+
-+  However, if you have problems with auto-detection, you can specify:
-+
-+  o  VideoRam - in kilobytes
-+
-+  o  MemBase - physical address of the linear framebuffer
-+
-+  o  IOBase - physical address of the memory mapped IO registers
-+
-+  o  ChipID - PCI DEVICE ID
-+
-+
-+
-+  6.  Driver Options
-+
-+
-+  o  "hw_cursor" - request hardware cursor (default)
-+
-+  o  "sw_cursor" - software cursor only
-+
-+  o  "no_accel" - software rendering only
-+
-+  o  "dac_8_bit" - use color weight 888 in 8 bpp mode (default)
-+
-+  o  "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
-+
-+
-+
-+  7.  Known Limitations
-+
-+
-+  o  None
-+
-+
-+
-+  8.  Authors
-+
-+  The X11R7.5 driver was originally part of XFree86 4.4 rc2.
-+
-+  The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
-+
-+  o  Rickard E. (Rik) Faith  <mailto:faith@precisioninsight.com>
-+
-+  o  Kevin E. Martin  <mailto:kevin@precisioninsight.com>
-+
-+  The XFree86 4 driver was funded by ATI and was donated to The XFree86
-+  Project by:
-+
-+      Precision Insight, Inc.
-+      Cedar Park, TX
-+      USA
-+
-+
-+  The XFree86 3.3.x driver used for the port was written by:
-+
-+  o  Rickard E. (Rik) Faith  <mailto:faith@precisioninsight.com>
-+
-+  o  Kevin E. Martin  <mailto:kevin@precisioninsight.com>
-+
-+     The XFree86 3.3.x driver was funded by ATI and was donated to The
-+     XFree86 Project by Precision Insight, Inc. It was based in part on
-+     an earlier driver that was written by:
-+
-+  o  Alan Hourihane  <mailto:alanh@fairlite.demon.co.uk>
-+
-+  o  Dirk Hohndel  <mailto:hohndel@suse.de>
-+
-+  This early driver was funded and donated to The XFree86 Project by:
-+
-+      SuSE GmbH
-+      Schanzaekerstr. 10
-+      90443 Nuernberg
-+      Germany
-+
-+
-+
-+  http://www.precisioninsight.com
-+
-+  http://www.suse.com
-+
- 
- Please submit bugs & patches to the Xorg bugzilla:
- 
-diff --git a/README.r128 b/README.r128
-deleted file mode 100644
-index dcc2715..0000000
---- a/README.r128
-+++ /dev/null
-@@ -1,160 +0,0 @@
--  Information for ATI Rage 128 Users
--  Precision Insight, Inc., SuSE GmbH
--  13 June 2000
--  ____________________________________________________________
--
--  Table of Contents
--
--
--  1. Supported Hardware
--  2. Features
--  3. Technical Notes
--  4. Reported Working Video Cards
--  5. Configuration
--  6. Driver Options
--  7. Known Limitations
--  8. Authors
--
--
--  ______________________________________________________________________
--
--  [1m1.  Supported Hardware[0m
--
--
--  +o  ATI Rage 128 based cards
--
--
--
--  [1m2.  Features[0m
--
--
--  +o  Full support (including hardware accelerated 2D drawing) for 8, 15,
--     16, 24 bit pixel depths.
--
--  +o  Hardware cursor support to reduce sprite flicker.
--
--  +o  Support for high resolution video modes up to 1800x1440 @ 70Hz.
--
--  +o  Support for doublescan video modes (e.g., 320x200 and 320x240).
--
--  +o  Support for gamma correction at all pixel depths.
--
--  +o  Fully programmable clock supported.
--
--  +o  Robust text mode restore for VT switching.
--
--
--
--  [1m3.  Technical Notes[0m
--
--
--  +o  None
--
--
--
--  [1m4.  Reported Working Video Cards[0m
--
--
--  +o  Rage Fury AGP 32MB
--
--  +o  XPERT 128 AGP 16MB
--
--  +o  XPERT 99 AGP 8MB
--
--
--
--  [1m5.  Configuration[0m
--
--  The driver auto-detects all device information necessary to initialize
--  the card.  The only lines you need in the "Device" section of your
--  xorg.conf file are:
--
--         Section "Device"
--             Identifier "Rage 128"
--             Driver     "r128"
--         EndSection
--
--
--  or let xorgconfig do this for you.
--
--  However, if you have problems with auto-detection, you can specify:
--
--  +o  VideoRam - in kilobytes
--
--  +o  MemBase  - physical address of the linear framebuffer
--
--  +o  IOBase   - physical address of the memory mapped IO registers
--
--  +o  ChipID   - PCI DEVICE ID
--
--
--
--  [1m6.  Driver Options[0m
--
--
--  +o  "hw_cursor" - request hardware cursor (default)
--
--  +o  "sw_cursor" - software cursor only
--
--  +o  "no_accel"  - software rendering only
--
--  +o  "dac_8_bit" - use color weight 888 in 8 bpp mode (default)
--
--  +o  "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
--
--
--
--  [1m7.  Known Limitations[0m
--
--
--  +o  None
--
--
--
--  [1m8.  Authors[0m
--
--  The X11R6.8 driver was originally part of XFree86 4.4 rc2.
--
--  The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
--
--  +o  Rickard E. (Rik) Faith  <faith@precisioninsight.com>
--
--  +o  Kevin E. Martin  <kevin@precisioninsight.com>
--
--  The XFree86 4 driver was funded by ATI and was donated to The XFree86
--  Project by:
--
--      Precision Insight, Inc.
--      Cedar Park, TX
--      USA
--
--
--  The XFree86 3.3.x driver used for the port was written by:
--
--  +o  Rickard E. (Rik) Faith  <faith@precisioninsight.com>
--
--  +o  Kevin E. Martin  <kevin@precisioninsight.com>
--
--     The XFree86 3.3.x driver was funded by ATI and was donated to The
--     XFree86 Project by Precision Insight, Inc.  It was based in part on
--     an earlier driver that was written by:
--
--  +o  Alan Hourihane  <alanh@fairlite.demon.co.uk>
--
--  +o  Dirk Hohndel  <hohndel@suse.de>
--
--  This early driver was funded and donated to The XFree86 Project by:
--
--      SuSE GmbH
--      Schanzaekerstr. 10
--      90443 Nuernberg
--      Germany
--
--
--
--  http://www.precisioninsight.com
--
--  http://www.suse.com
--
--
--
-diff --git a/README.r128.sgml b/README.r128.sgml
-deleted file mode 100644
-index 8d7f448..0000000
---- a/README.r128.sgml
-+++ /dev/null
-@@ -1,138 +0,0 @@
--<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[
--<!ENTITY % defs SYSTEM "defs.ent"> %defs;
--]>
--
--<article>
--<title>Information for ATI Rage 128 Users
--<author>Precision Insight, Inc., SuSE GmbH
--<date>13 June 2000
--
--<ident>
--</ident>
--
--<toc>
--
--<sect>Supported Hardware
--<p>
--<itemize>
--  <item>ATI Rage 128 based cards
--</itemize>
--
--
--<sect>Features
--<p>
--<itemize>
--  <item>Full support (including hardware accelerated 2D drawing) for 8, 15,
--        16, 24 bit pixel depths.
--  <item>Hardware cursor support to reduce sprite flicker.
--  <item>Support for high resolution video modes up to 1800x1440 @ 70Hz.
--  <item>Support for doublescan video modes (e.g., 320x200 and 320x240).
--  <item>Support for gamma correction at all pixel depths.
--  <item>Fully programmable clock supported.
--  <item>Robust text mode restore for VT switching.
--</itemize>
--
--
--<sect>Technical Notes
--<p>
--<itemize>
--  <item>None
--</itemize>
--
--
--<sect>Reported Working Video Cards
--<p>
--<itemize>
--  <item>Rage Fury AGP 32MB
--  <item>XPERT 128 AGP 16MB
--  <item>XPERT 99 AGP 8MB
--</itemize>
--
--
--<sect>Configuration
--<p>
--The driver auto-detects all device information necessary to
--initialize the card.  The only lines you need in the "Device"
--section of your xorg.conf file are:
--<verb>
--       Section "Device"
--           Identifier "Rage 128"
--           Driver     "r128"
--       EndSection
--</verb>
--or let <tt>xorgconfig</tt> do this for you.
--
--However, if you have problems with auto-detection, you can specify:
--<itemize>
--  <item>VideoRam - in kilobytes
--  <item>MemBase  - physical address of the linear framebuffer
--  <item>IOBase   - physical address of the memory mapped IO registers
--  <item>ChipID   - PCI DEVICE ID
--</itemize>
--
--
--<sect>Driver Options
--<p>
--<itemize>
--  <item>"hw_cursor" - request hardware cursor (default)
--  <item>"sw_cursor" - software cursor only
--  <item>"no_accel"  - software rendering only
--  <item>"dac_8_bit" - use color weight 888 in 8 bpp mode (default)
--  <item>"dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation)
--</itemize>
--
--
--<sect>Known Limitations
--<p>
--<itemize>
--  <item>None
--</itemize>
--
--
--<sect>Authors
--<p>
--The X11R&relvers; driver was originally part of XFree86 4.4 rc2.
--
--The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by:
--<itemize>
--   <item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email>
--   <item>Kevin E. Martin <email>kevin@precisioninsight.com</email>
--</itemize>
--<p>
--The XFree86 4 driver was funded by ATI and was donated to The XFree86
--Project by:
--<verb>
--    Precision Insight, Inc.
--    Cedar Park, TX
--    USA
--</verb>
--<p>
--The XFree86 3.3.x driver used for the port was written by:
--<itemize>
--   <item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email>
--   <item>Kevin E. Martin <email>kevin@precisioninsight.com</email>
--</itemize>
--The XFree86 3.3.x driver was funded by ATI and was donated to The XFree86
--Project by Precision Insight, Inc.  It was based in part on an earlier
--driver that was written by:
--<itemize>
--   <item>Alan Hourihane <email>alanh@fairlite.demon.co.uk</email>
--   <item>Dirk Hohndel <email>hohndel@suse.de</email>
--</itemize>
--<p>This early driver was funded and donated to The XFree86 Project by:
--<verb>
--    SuSE GmbH
--    Schanzaekerstr. 10
--    90443 Nuernberg
--    Germany
--</verb>
--
--<p>
--<htmlurl name="http://www.precisioninsight.com"
--          url="http://www.precisioninsight.com">
--<p>
--<htmlurl name="http://www.suse.com"
--          url="http://www.suse.com">
--
--
--</article>
-diff --git a/configure.ac b/configure.ac
-index 4e0f463..d5a0821 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,28 +20,30 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-r128],
--        6.8.1,
-+        [6.8.1],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-r128)
--
-+        [xf86-video-r128])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
--AM_INIT_AUTOMAKE([dist-bzip2])
-+# Initialize Automake
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- 
--# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
--m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
--XORG_MACROS_VERSION(1.2)
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-+m4_ifndef([XORG_MACROS_VERSION],
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
-+XORG_DEFAULT_OPTIONS
- 
- AM_MAINTAINER_MODE
- 
--# Checks for programs.
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- if test "x$GCC" = "xyes"; then
- 	CPPFLAGS="$CPPFLAGS -Wall"
-@@ -49,38 +51,35 @@ fi
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri],
-+AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri],
-                                   [Disable DRI support [[default=auto]]]),
-               [DRI="$enableval"],
-               [DRI=auto])
- 
--# Checks for extensions
--XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto)
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES])
- PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-                   HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-                   HAVE_XEXTPROTO_71="no")
- AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-+sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`
- 
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
- if test "$DRI" != no; then
- 	AC_CHECK_FILE([${sdkdir}/dri.h],
-                       [have_dri_h="yes"], [have_dri_h="no"])
-@@ -126,26 +125,20 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--AC_SUBST([XORG_CFLAGS])
--AC_SUBST([DRI_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=r128
- AC_SUBST([DRIVER_NAME])
- 
--XORG_MANPAGE_SECTIONS
--XORG_RELEASE_VERSION
--XORG_CHECK_LINUXDOC
--XORG_CHANGELOG
--
- AC_MSG_NOTICE(
- [Please change the Driver line in xorg.conf from "ati" to "r128" or install]
- [the ati wrapper as well:]
- [    git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati]
- )
- 
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 858ba62..4e22d61 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,27 +1,24 @@
- #
- # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
--# 
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation.
--# 
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--# 
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
--# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--# OTHER DEALINGS IN THE SOFTWARE.
--# 
--# Except as contained in this notice, the name of the copyright holders shall
--# not be used in advertising or otherwise to promote the sale, use or
--# other dealings in this Software without prior written authorization
--# from the copyright holders.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice (including the next
-+# paragraph) shall be included in all copies or substantial portions of the
-+# Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
- # 
- 
- drivermandir = $(DRIVER_MAN_DIR)
-@@ -34,25 +31,11 @@ EXTRA_DIST = r128.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
- 
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- 
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/r128.man b/man/r128.man
-index 5c7c4fe..4ba933d 100644
---- a/man/r128.man
-+++ b/man/r128.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128.man,v 1.3 2001/06/01 02:10:05 dawes Exp $
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH R128 __drivermansuffix__ __vendorversion__
-diff --git a/src/r128_driver.c b/src/r128_driver.c
-index d6448b6..9d08d77 100644
---- a/src/r128_driver.c
-+++ b/src/r128_driver.c
-@@ -938,14 +938,6 @@ static Bool R128PreInitConfig(ScrnInfoPtr pScrn)
- 				/* BIOS */
-     from              = X_PROBED;
-     info->BIOSAddr    = info->PciInfo->biosBase & 0xfffe0000;
--    if (dev->BiosBase) {
--	xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--		   "BIOS address override, using 0x%08lx instead of 0x%08lx\n",
--		   dev->BiosBase,
--		   info->BIOSAddr);
--	info->BIOSAddr = dev->BiosBase;
--	from           = X_CONFIG;
--    }
-     if (info->BIOSAddr) {
- 	xf86DrvMsg(pScrn->scrnIndex, from,
- 		   "BIOS at 0x%08lx\n", info->BIOSAddr);
diff --git a/testing/xf86-video-rendition/PKGBUILD b/testing/xf86-video-rendition/PKGBUILD
deleted file mode 100644
index 3924c7354..000000000
--- a/testing/xf86-video-rendition/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 136515 2011-08-30 08:45:11Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-rendition
-pkgver=4.2.4
-pkgrel=5
-pkgdesc="X.org Rendition video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.0')
-conflicts=('xorg-server<1.11.0')
-options=('!libtool' '!strip')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('16148c25183f7829c22bc9dfdb588c1a16bf4565')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  strip --strip-unneeded "${pkgdir}/usr/lib/xorg/modules/drivers/rendition_drv.so"
-}
diff --git a/testing/xf86-video-s3/LICENSE b/testing/xf86-video-s3/LICENSE
deleted file mode 100644
index a4c8d5dd4..000000000
--- a/testing/xf86-video-s3/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-     Copyright 2001  Ani Joshi <ajoshi@unixbox.com>
-
-     XFree86 4.x driver for S3 chipsets
-
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation and
-that the name of Ani Joshi not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  Ani Joshi makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as-is" without express or implied warranty.
-
-ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
diff --git a/testing/xf86-video-s3/PKGBUILD b/testing/xf86-video-s3/PKGBUILD
deleted file mode 100644
index 892f52e0a..000000000
--- a/testing/xf86-video-s3/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 136513 2011-08-30 08:45:08Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-s3
-pkgver=0.6.3
-pkgrel=6
-pkgdesc="X.org S3 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.0')
-conflicts=('xorg-server<1.11.0')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
-md5sums=('5eb06d88533fb327d067928faeb20860'
-         '77a455ce7e254c73b1cbd408c7f4ecf4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  autoreconf -fi
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/xf86-video-s3/git-fixes.patch b/testing/xf86-video-s3/git-fixes.patch
deleted file mode 100644
index 712b3c9c0..000000000
--- a/testing/xf86-video-s3/git-fixes.patch
+++ /dev/null
@@ -1,458 +0,0 @@
-diff --git a/COPYING b/COPYING
-index 7f33cbf..458ab5f 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,70 @@
--This is a stub file.  This package has not yet had its complete licensing
--information compiled.  Please see the individual source files for details on
--your rights to use and modify this software.
-+     Copyright 2001  Ani Joshi <ajoshi@unixbox.com>
- 
--Please submit updated COPYING files to the Xorg bugzilla:
-+     XFree86 4.x driver for S3 chipsets
- 
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
- 
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+Permission to use, copy, modify, distribute, and sell this software and its
-+documentation for any purpose is hereby granted without fee, provided that
-+the above copyright notice appear in all copies and that both that copyright
-+notice and this permission notice appear in supporting documentation and
-+that the name of Ani Joshi not be used in advertising or
-+publicity pertaining to distribution of the software without specific,
-+written prior permission.  Ani Joshi makes no representations
-+about the suitability of this software for any purpose.  It is provided
-+"as-is" without express or implied warranty.
-+
-+ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-+EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-+CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-+PERFORMANCE OF THIS SOFTWARE.
-+Copyright 2007 George Sapountzis
-+
-+Permission is hereby granted, free of charge, to any person obtaining a
-+copy of this software and associated documentation files (the "Software"),
-+to deal in the Software without restriction, including without limitation
-+the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+and/or sell copies of the Software, and to permit persons to whom the
-+Software is furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice (including the next
-+paragraph) shall be included in all copies or substantial portions of the
-+Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+SOFTWARE.
-+
-+Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of
-+this software and associated documentation files (the "Software"), to deal in
-+the Software without restriction, including without limitation the rights to
-+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-+of the Software, and to permit persons to whom the Software is furnished to do
-+so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in all
-+copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Except as contained in this notice, the name of the XFree86 Project shall not
-+be used in advertising or otherwise to promote the sale, use or other dealings
-+in this Software without prior written authorization from the XFree86 Project.
-+
-+
-+Copyright 1995-1997 The XFree86 Project, Inc.
-+Copyright (c) 1999,2000  The XFree86 Project Inc.
- 
--http://lists.freedesktop.org/mailman/listinfo/xorg
-diff --git a/ChangeLog b/ChangeLog
-deleted file mode 100644
-index ad0b227..0000000
---- a/ChangeLog
-+++ /dev/null
-@@ -1,133 +0,0 @@
--2009-06-25  Evgeny M. zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_driver.c:
--	Revert the old behaviour when the BIOS settings are used for
--	intialization of DRAM/VRAM timings, i. e. we don't touch the
--	timings during initialization phase until any memory option (like
--	slow_edodram) is specified.
--	
--	Add manual page.	
--
--2009-05-25  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--	
--	* src/s3_driver.c:
--	* src/s3_video.c:
--	
--	Enable Xv extension for Trio64V+ (thanks to Egor Ivanov for 
--	testing on real hardware) and Trio64UV+ (Tested only on Trio64V2 by
--	overriding Chipset with "Trio64UV+" but not on real hardware).
--
--	S3 Trio64V+ now using NewMMIO. Trio64V+ chips have the same ChipId
--	as Trio32/64 but only with chip revision greater or eq 0x40. So if 
--	you have problems with NewMMIO, you may override ChipRev in "Device" 
-- 	section of your xorg.conf: "ChipRev" 0x00. Note: disabling the NewMMIO 
--	also disables overlay video (Xv) because it isn't implemented for
--	Old MMIO yet.
--	
--2009-05-04  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_driver.c:
--	* src/s3_shadow.c:
--
--	Add shadowFB option. It can be used to speedup drawing when
--	hardware acceleration is undesirable or unavailable (for colour depth
--	24 with 24 bpp framebuffer, for example). shadowFB is disabled by
--	default. Enabling shadowFB option disables HW acceleration. Thanks
--	to Egor Ivanov for initial porting of shadowFB from s3virge.
--
--	Interlace mode support.
--
--	Close bug #14999.
--	
--2008-07-06  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_video.c: 
--
--	Streams Processor initialization.
--
--	XVideo support for 16, 24 and 32 bpp (only for TRIO64V2).
--
--	* src/s3_driver.c: 
--
--	Add XVideo option (enabled by default).
--
--	Replace "swcursor" by "hwcursor" option (HW cursor 
--	not implemented yet for all chipsets).
--
--	Close bug #5527: 24-bit colour depth support (24bpp and 
--	32bpp framebuffer) for TRIOs. Acceleration doesn't work
--	with packed colour mode (24 bpp FB) but works with 32bpp 
--	framebuffer mode (hardware limitation? -- need data).
--
--	Fix system hang-up when switching between console and X session.
--
--	Some minor changes of driver messages.
--
--2008-02-23  Evgeny M. Zubok <evgeny.zubok@tochka.ru>
--
--	* src/s3_driver.c: Add DPMS support for S3 Trio64V2 and possibly
--	others (need testing): S3 Trio64UV+. S3 Aurora64V+ and S3 Trio32/64
--	* src/s3_Trio64DAC: Change clocks for S3 Trio64V2 to make
--	the 1024x768@16bpp mode work.
--	Thanks to Richard Driscoll for these patches.
--	
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/s3.h:
--	Bump to 0.4.1 for Xv changes.
--
--2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
--
--	* src/s3_video.c: (S3PutImage):
--	Add a DrawablePtr argument to the XV functions to pave the way for
--	redirected video.
--
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/s3.h:
--	* src/s3_IBMRGB.c:
--	* src/s3_Ti.c:
--	* src/s3_Trio64DAC.c:
--	* src/s3_bios.c:
--	* src/s3_cursor.c:
--	* src/s3_dga.c:
--	* src/s3_driver.c:
--	* src/s3_video.c:
--	Unlibcwrap.  Bump server version requirement.  Bump to 0.4.0.
--
--2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version for X11R7 release.
--
--2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for final X11R7 release candidate.
--
--2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC3 release.
--
--2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Remove extraneous AC_MSG_RESULT.
--
--2005-11-29  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	Only build dlloader modules by default.
--
--2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC2 release.
--
--2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update pkgcheck dependencies to work with separate build roots.
-diff --git a/Makefile.am b/Makefile.am
-index 7052905..4c278ba 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,5 +18,15 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--AUTOMAKE_OPTIONS = foreign
- SUBDIRS = src man
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
-+
-+.PHONY: ChangeLog INSTALL
-+
-+INSTALL:
-+	$(INSTALL_CMD)
-+
-+ChangeLog:
-+	$(CHANGELOG_CMD)
-+
-+dist-hook: ChangeLog INSTALL
-diff --git a/configure.ac b/configure.ac
-index 0eecc87..0ac34f9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,42 +20,50 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-s3],
--        0.6.3,
-+        [0.6.3],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-s3)
--
-+        [xf86-video-s3])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
--AM_INIT_AUTOMAKE([dist-bzip2])
--
-+# Initialize Automake
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
- 
--# Checks for programs.
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-+m4_ifndef([XORG_MACROS_VERSION],
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
-+XORG_DEFAULT_OPTIONS
-+
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
-+
-+# Checks for programs.
-+AM_PROG_CC_C_O
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
- 
- # Checks for libraries.
- SAVE_CPPFLAGS="$CPPFLAGS"
-@@ -65,28 +73,20 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
-               [#include "xorg-server.h"])
- CPPFLAGS="$SAVE_CPPFLAGS"
- 
--# Checks for header files.
--AC_HEADER_STDC
--
- if test "x$XSERVER_LIBPCIACCESS" = xyes; then
-     PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
-     XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
- fi
- AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=s3
- AC_SUBST([DRIVER_NAME])
- 
--XORG_MANPAGE_SECTIONS
--XORG_RELEASE_VERSION
--
--XORG_CHECK_LINUXDOC
--
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index f0eb29b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,27 +1,24 @@
- #
- # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
--# 
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation.
--# 
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--# 
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
--# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--# OTHER DEALINGS IN THE SOFTWARE.
--# 
--# Except as contained in this notice, the name of the copyright holders shall
--# not be used in advertising or otherwise to promote the sale, use or
--# other dealings in this Software without prior written authorization
--# from the copyright holders.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice (including the next
-+# paragraph) shall be included in all copies or substantial portions of the
-+# Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
- # 
- 
- drivermandir = $(DRIVER_MAN_DIR)
-@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
- 
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- 
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/src/s3.h b/src/s3.h
-index 49b8a54..0875fc9 100644
---- a/src/s3.h
-+++ b/src/s3.h
-@@ -113,7 +113,6 @@ typedef struct _S3Rec {
-         XAAInfoRecPtr           pXAA;
- 	xf86CursorInfoPtr	pCurs;
- 	xf86Int10InfoPtr	pInt10;
--	vbeInfoPtr		pVBE;
-         XF86VideoAdaptorPtr     adaptor;
-         S3PortPrivPtr           portPrivate;
- 
-diff --git a/src/s3_driver.c b/src/s3_driver.c
-index 29e343d..4519b33 100644
---- a/src/s3_driver.c
-+++ b/src/s3_driver.c
-@@ -309,6 +309,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
- 	S3Ptr pS3;
- 	vgaHWPtr hwp;
- 	ClockRangePtr clockRanges;
-+	vbeInfoPtr pVBE;
- 	rgb zeros = {0, 0, 0};
- 	Gamma gzeros = {0.0, 0.0, 0.0};
- 	int i, vgaCRIndex, vgaCRReg;
-@@ -436,7 +437,8 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags)
- 	}
- 
- 	if (xf86LoadSubModule(pScrn, "vbe")) {
--		pS3->pVBE = VBEInit(pS3->pInt10, pEnt->index);
-+		pVBE = VBEInit(pS3->pInt10, pEnt->index);
-+		vbeFree(pVBE);
- 	}
- 	
- 	if (pS3->shadowFB) {
diff --git a/testing/xf86-video-s3virge/PKGBUILD b/testing/xf86-video-s3virge/PKGBUILD
deleted file mode 100644
index 3532b09a6..000000000
--- a/testing/xf86-video-s3virge/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 136511 2011-08-30 08:45:06Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-s3virge
-pkgver=1.10.4
-pkgrel=6
-pkgdesc="X.org S3 Virge video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-options=(!libtool)
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        copyright.patch)
-md5sums=('6517bbbf808c700502d51acdc44662f8'
-         'f91fb259e3632fb9130fcbe69ecd9d6a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/copyright.patch"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-savage/PKGBUILD b/testing/xf86-video-savage/PKGBUILD
deleted file mode 100644
index aab22730c..000000000
--- a/testing/xf86-video-savage/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 140224 2011-10-10 09:15:14Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-savage
-pkgver=2.3.3
-pkgrel=1
-pkgdesc="X.org savage video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc' 'savage-dri')
-makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
-conflicts=('xorg-server<1.10.0')
-options=(!libtool !makeflags)
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-dri
-  make
-  make DESTDIR="${pkgdir}" install
-
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-siliconmotion/PKGBUILD b/testing/xf86-video-siliconmotion/PKGBUILD
deleted file mode 100644
index 54481e5eb..000000000
--- a/testing/xf86-video-siliconmotion/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 136507 2011-08-30 08:45:01Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-siliconmotion
-pkgver=1.7.5
-pkgrel=3
-pkgdesc="X.org siliconmotion video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('946acae0822d51da57abe8b7ed049691bd731589')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-sis/PKGBUILD b/testing/xf86-video-sis/PKGBUILD
deleted file mode 100644
index 2e21cca87..000000000
--- a/testing/xf86-video-sis/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 136505 2011-08-30 08:44:59Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-sis
-pkgver=0.10.3
-pkgrel=5
-pkgdesc="X.org SiS video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc' 'sis-dri')
-makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
-conflicts=('xorg-server<1.11.0')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('158673747e240b0c33499685a32d46bdaead7cd5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-dri
-  make
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-sisimedia/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch b/testing/xf86-video-sisimedia/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch
deleted file mode 100644
index fd87b6c8c..000000000
--- a/testing/xf86-video-sisimedia/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e4f6a2fcd5712d0f994d3719b9c6c13f5b02bc7c Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Fri, 9 Jan 2009 16:34:01 -0800
-Subject: [PATCH 01/10] Remove xorgconfig & xorgcfg from See Also list in man page
-
----
- man/sis.man |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/man/sis.man b/man/sis.man
-index d743fe6..c321808 100644
---- a/man/sis.man
-+++ b/man/sis.man
-@@ -429,7 +429,7 @@ The amount is to be specified in megabyte, the default is 8.
- none.
- .SH "SEE ALSO"
- #ifdef __xservername__
--__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
-+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
- #else
- XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
- #endif
--- 
-1.6.5.4
-
diff --git a/testing/xf86-video-sisimedia/0002-Remove-XFree86-Misc-PassMessage-support.patch b/testing/xf86-video-sisimedia/0002-Remove-XFree86-Misc-PassMessage-support.patch
deleted file mode 100644
index 860e593c6..000000000
--- a/testing/xf86-video-sisimedia/0002-Remove-XFree86-Misc-PassMessage-support.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -p -up xf86-video-sis-0.9.1/configure.ac.orig xf86-video-sis-0.9.1/configure.ac
---- xf86-video-sis-0.9.1/configure.ac.orig	2010-01-27 15:34:26.000000000 -0500
-+++ xf86-video-sis-0.9.1/configure.ac	2010-01-27 15:34:43.000000000 -0500
-@@ -58,7 +58,6 @@ XORG_DRIVER_CHECK_EXT(XINERAMA, xinerama
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
--XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto)
- XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
- # Checks for pkg-config packages
-diff -p -up xf86-video-sis-0.9.1/src/sis_driver.c.orig xf86-video-sis-0.9.1/src/sis_driver.c
---- xf86-video-sis-0.9.1/src/sis_driver.c.orig	2010-01-27 15:35:05.000000000 -0500
-+++ xf86-video-sis-0.9.1/src/sis_driver.c	2010-01-27 15:35:39.000000000 -0500
-@@ -86,8 +86,6 @@
- #include "mibank.h"
- #include "mipointer.h"
- #include "mibstore.h"
--#define _XF86MISC_SERVER_
--#include <X11/extensions/xf86misc.h>
- #include "edid.h"
- 
- #define SIS_NEED_inSISREG
-@@ -506,11 +504,6 @@ xf86DrvMsg(0, X_INFO, "                 
- 	    pScrn->FreeScreen       = SISFreeScreen;
- 	    pScrn->ValidMode        = SISValidMode;
- 	    pScrn->PMEvent          = SISPMEvent; /*add PM function for ACPI hotkey,Ivans*/
--#ifdef X_XF86MiscPassMessage
--//   if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) {
--//	       pScrn->HandleMessage = SISHandleMessage;
--//	    }
--#endif
- 	    foundScreen = TRUE;
- 	}
-     #ifdef SISDUALHEAD
-diff -p -up xf86-video-sis-0.9.1/src/sis_driver.h.orig xf86-video-sis-0.9.1/src/sis_driver.h
---- xf86-video-sis-0.9.1/src/sis_driver.h.orig	2010-01-27 15:35:49.000000000 -0500
-+++ xf86-video-sis-0.9.1/src/sis_driver.h	2010-01-27 15:36:04.000000000 -0500
-@@ -791,10 +791,6 @@ static Bool SISHotkeySwitchMode(ScrnInfo
- #ifdef SISDUALHEAD
- static Bool	SISSaveScreenDH(ScreenPtr pScreen, int mode);
- #endif
--#ifdef X_XF86MiscPassMessage
--extern int	SISHandleMessage(int scrnIndex, const char *msgtype,
--				const char *msgval, char **retmsg);
--#endif
- static void     SISFreeScreen(int scrnIndex, int flags);
- static ModeStatus SISValidMode(int scrnIndex, DisplayModePtr mode,
- 				Bool verbose, int flags);
-diff -p -up xf86-video-sis-0.9.1/src/sis_utility.c.orig xf86-video-sis-0.9.1/src/sis_utility.c
---- xf86-video-sis-0.9.1/src/sis_utility.c.orig	2010-01-27 15:36:23.000000000 -0500
-+++ xf86-video-sis-0.9.1/src/sis_utility.c	2010-01-27 15:36:59.000000000 -0500
-@@ -40,8 +40,6 @@
- #define NEED_EVENTS
- #include <X11/X.h>
- #include "dixstruct.h"
--#define _XF86MISC_SERVER_
--#include <X11/extensions/xf86misc.h>
- 
- #include "sis_videostr.h"
- 
-@@ -262,9 +260,6 @@ typedef struct {
-     int		 (*HandleSiSDirectCommand[SISCTRL_MAX_SCREENS])(xSiSCtrlCommandReply *);
- } xSiSCtrlScreenTable;
- 
--#ifdef X_XF86MiscPassMessage
--int		SISHandleMessage(int scrnIndex, const char *msgtype, const char *msgval, char **retmsg);
--#endif
- void		SiSCtrlExtInit(ScrnInfoPtr pScrn);
- void		SiSCtrlExtUnregister(SISPtr pSiS, int index);
- 
-@@ -975,19 +970,6 @@ unsigned int SISVGADetected(ScrnInfoPtr 
- }
- 
- /***********************************
-- *     MessageHandler interface    *
-- *   (unused now; use extension)   *
-- ***********************************/
--
--#ifdef X_XF86MiscPassMessage
--int
--SISHandleMessage(int scrnIndex, const char *msgtype, const char *msgval, char **retmsg)
--{
--    return BadMatch;
--}
--#endif
--
--/***********************************
-  *   SiSCtrl extension interface   *
-  ***********************************/
- 
diff --git a/testing/xf86-video-sisimedia/0003-Fix-build-with-Werror-format-security.patch b/testing/xf86-video-sisimedia/0003-Fix-build-with-Werror-format-security.patch
deleted file mode 100644
index 4fc355bbb..000000000
--- a/testing/xf86-video-sisimedia/0003-Fix-build-with-Werror-format-security.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 9b010b7db7f0c6730c1a1b3cd473d49b01ed5b5f Mon Sep 17 00:00:00 2001
-From: Ander Conselvan de Oliveira <ander@mandriva.com.br>
-Date: Mon, 22 Jun 2009 16:07:26 -0400
-Subject: [PATCH] Fix build with -Werror=format-security
-
----
- src/sis_driver.c   |    4 ++--
- src/sis_mergedfb.c |    6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/sis_driver.c b/src/sis_driver.c
-index 5b91004..0a154db 100644
---- a/src/sis_driver.c
-+++ b/src/sis_driver.c
-@@ -831,14 +831,14 @@ SISErrorLog(ScrnInfoPtr pScrn, const char *format, ...)
-     static const char *str = "**************************************************\n";
- 
-     va_start(ap, format);
--    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
-+    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
-     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 	"                      ERROR:\n");
-     xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap);
-     va_end(ap);
-     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- 	"                  END OF MESSAGE\n");
--    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
-+    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
- }
- 
- static void
-diff --git a/src/sis_mergedfb.c b/src/sis_mergedfb.c
-index 61b4255..feca024 100644
---- a/src/sis_mergedfb.c
-+++ b/src/sis_mergedfb.c
-@@ -357,7 +357,7 @@ SiSCopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
- 
-        strcat(printbuffer, namebuf1);
- 
--       xf86DrvMsg(pScrn->scrnIndex, X_INFO, printbuffer);
-+       xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%s", printbuffer);
-     }
- 
-     mode->next = mode;
-@@ -2137,7 +2137,7 @@ SiSUpdateXineramaScreenInfo(ScrnInfoPtr pScrn1)
-        if(infochanged && !usenonrect) {
- 	  xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb,
- 			"Current screen size does not match maximum display modes...\n");
--	  xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, rectxine);
-+	  xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, "%s", rectxine);
-        }
- 
-     } else if(infochanged && usenonrect) {
-@@ -2145,7 +2145,7 @@ SiSUpdateXineramaScreenInfo(ScrnInfoPtr pScrn1)
-        usenonrect = FALSE;
-        xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb,
- 		"Only clone modes available for this screen size...\n");
--       xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, rectxine);
-+       xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, "%s", rectxine);
- 
-     }
- 
--- 
-1.6.2.4
-
diff --git a/testing/xf86-video-sisimedia/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch b/testing/xf86-video-sisimedia/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch
deleted file mode 100644
index 68ec63138..000000000
--- a/testing/xf86-video-sisimedia/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 49c641b638ac36d2a559555c04a3bd2777c8d071 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Fri, 1 May 2009 16:52:10 -0700
-Subject: [PATCH 04/10] Make sisRegs3D4 big enough to hold all values written to it
-
-Increase size from 0xff to 0x100 since SiS315Save (sis_dac.c line 752)
-writes values into sisRegs3D4[0x00..0xff] if ChipType >= XGI_20
-
-[This bug was found by the Parfait bug checking tool.
- For more information see http://research.sun.com/projects/parfait ]
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
----
- src/sis.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/sis.h b/src/sis.h
-index 9bafd4b..773f709 100644
---- a/src/sis.h
-+++ b/src/sis.h
-@@ -747,7 +747,7 @@ typedef struct {
-     UChar  sisRegsGR[10];
-     UChar  sisDAC[768];
-     UChar  sisRegs3C4[0x80];
--    UChar  sisRegs3D4[0xff];
-+    UChar  sisRegs3D4[0x100];
-     UChar  sisRegs3C2;
-     UChar  sisCapt[0x60];
-     UChar  sisVid[0x50];
--- 
-1.6.5.4
-
diff --git a/testing/xf86-video-sisimedia/0005-Correct-bounds-check-of-blitClip-array-access.patch b/testing/xf86-video-sisimedia/0005-Correct-bounds-check-of-blitClip-array-access.patch
deleted file mode 100644
index 038322bf6..000000000
--- a/testing/xf86-video-sisimedia/0005-Correct-bounds-check-of-blitClip-array-access.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 933dd8f860883c613acb5bcdf6b66100dbdfa952 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Fri, 1 May 2009 16:57:22 -0700
-Subject: [PATCH 05/10] Correct bounds check of blitClip array access
-
-Array is defined as blitClip[NUM_BLIT_PORTS], so invalid indexes
-are >= NUM_BLIT_PORTS, not just > NUM_BLIT_PORTS
-
-[This bug was found by the Parfait bug checking tool.
- For more information see http://research.sun.com/projects/parfait ]
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
----
- src/sis_video.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: xf86-video-sis-0.9.1/src/sis_video.c
-===================================================================
---- xf86-video-sis-0.9.1.orig/src/sis_video.c
-+++ xf86-video-sis-0.9.1/src/sis_video.c
-@@ -4656,7 +4656,7 @@ SISStopVideoBlit(ScrnInfoPtr pScrn, ULon
-     * adapt->flags but we provide it anyway.
-     */
- 
--   if(index > NUM_BLIT_PORTS) return;
-+   if(index >= NUM_BLIT_PORTS) return;
- 
-    REGION_EMPTY(pScrn->pScreen, &pPriv->blitClip[index]);
- 
-@@ -4698,7 +4698,7 @@ SISPutImageBlit_671(
-    int	  xoffset = 0, yoffset = 0;
-    Bool   first;
- 
--   if(index > NUM_BLIT_PORTS)
-+   if(index >= NUM_BLIT_PORTS)
-       return BadMatch;
- 
-    if(!height || !width)
diff --git a/testing/xf86-video-sisimedia/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch b/testing/xf86-video-sisimedia/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch
deleted file mode 100644
index f023c774e..000000000
--- a/testing/xf86-video-sisimedia/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 910073e0ab3a7bf9e5c9d97437a879d97edc2714 Mon Sep 17 00:00:00 2001
-From: root <root@greentea.conectiva>
-Date: Wed, 1 Jul 2009 09:59:39 -0400
-Subject: [PATCH] Fix backlight off on SiS30x. video bridges.
-
----
- src/init301.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/init301.c b/src/init301.c
-index c179ae8..70a6aab 100644
---- a/src/init301.c
-+++ b/src/init301.c
-@@ -9261,7 +9261,7 @@ void
- SiS_SiS30xBLOff(struct SiS_Private *SiS_Pr)
- {
-   /* Switch off LCD backlight on SiS30xLV */
--  SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x26,0xFE);
-+  SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x26,0xFC);
-   SiS_DDC2Delay(SiS_Pr,0xff00);
- }
- 
--- 
-1.5.4.3
-
diff --git a/testing/xf86-video-sisimedia/0006-Add-IgnoreHotkeyFlag-driver-option.patch b/testing/xf86-video-sisimedia/0006-Add-IgnoreHotkeyFlag-driver-option.patch
deleted file mode 100644
index 8ebc799a7..000000000
--- a/testing/xf86-video-sisimedia/0006-Add-IgnoreHotkeyFlag-driver-option.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 072af02d180c1965f30246ea269d208292ed6f05 Mon Sep 17 00:00:00 2001
-From: root <root@greentea.conectiva>
-Date: Wed, 1 Jul 2009 14:13:52 -0400
-Subject: [PATCH] Add IgnoreHotkeyFlag driver option.
-
-Some BIOSes do not set the hotkey flag correctly. Without this option
-set, the driver won't change the mirroring state of LCD and VGA
-connections if the BIOS did not set this flag.
----
- src/sis.h        |    3 +++
- src/sis_driver.c |    2 +-
- src/sis_opt.c    |   13 ++++++++++++-
- 3 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/src/sis.h b/src/sis.h
-index c50690b..c82c302 100644
---- a/src/sis.h
-+++ b/src/sis.h
-@@ -1565,6 +1565,9 @@ typedef struct {
- 
-   /* Enable special 1366x768x60hz mode of LVDS panel. Ivans@090109 */
-     Bool  EnablePanel_1366x768;
-+
-+    /* Ignore hotkey flag on capability changed APM events */
-+    Bool IgnoreHotkeyFlag;
- 	
- } SISRec, *SISPtr;
- 
-diff --git a/src/sis_driver.c b/src/sis_driver.c
-index c935c11..2a5001c 100644
---- a/src/sis_driver.c
-+++ b/src/sis_driver.c
-@@ -11370,7 +11370,7 @@ SISPMEvent(int scrnIndex, pmEvent event, Bool undo)
- 	                inSISIDXREG(SISCR,0x3d,hotkeyflag);/*check device switch flag from BIOS CR 0x3d bit[2].*/
-                         
- 			
--			if(hotkeyflag & 0x04)
-+			if(pSiS->IgnoreHotkeyFlag || (hotkeyflag & 0x04))
- 			{	
- 						
- 			SISCRT1PreInit(pScrn); /*redetecting CRT1, pSiS->CRT1detected will update.*/
-diff --git a/src/sis_opt.c b/src/sis_opt.c
-index 4b79f7f..7f726ea 100644
---- a/src/sis_opt.c
-+++ b/src/sis_opt.c
-@@ -159,7 +159,8 @@ typedef enum {
-     OPTION_PSEUDO,
-     OPTION_FUTRO_TIMING, /*chaoyu's modified: for Fuji-Siemans specail timing*/
-     OPTION_TRACEVGAMISCW,
--    OPTION_USETIMING1366  /*option of enable 1366x768 timing for LVDS panel. Ivans@090109*/
-+    OPTION_USETIMING1366,  /*option of enable 1366x768 timing for LVDS panel. Ivans@090109*/
-+    OPTION_IGNOREHOTKEYFLAG
- } SISOpts;
- 
- static const OptionInfoRec SISOptions[] = {
-@@ -305,6 +306,7 @@ static const OptionInfoRec SISOptions[] = {
-     { OPTION_FUTRO_TIMING,		"FutroTiming",			OPTV_BOOLEAN,   {0}, FALSE },/*chaoyu's modified: for Fuji-seimans special timing*/
-     { OPTION_TRACEVGAMISCW,             "TraceVgaMISCW",                OPTV_BOOLEAN,   {0}, FALSE },/*Ivans added for helping detected CRT1 using BIOS setting.*/
-     { OPTION_USETIMING1366,              "UseTiming1366",                  OPTV_BOOLEAN,   {0}, FALSE },/*enable 1366 timing on LVDS, Ivans@090109*/
-+    { OPTION_IGNOREHOTKEYFLAG,		"IgnoreHotkeyFlag",		OPTV_BOOLEAN,	{0}, FALSE },
-     { -1,				NULL,				OPTV_NONE,	{0}, FALSE }
- };
- 
-@@ -624,6 +626,7 @@ SiSOptions(ScrnInfoPtr pScrn)
-     pSiS->CRT2IsScrn0 = FALSE;
- #endif
- #endif
-+    pSiS->IgnoreHotkeyFlag = FALSE;
-   
-     /* Chipset dependent defaults */
- 
-@@ -2419,6 +2422,14 @@ SiSOptions(ScrnInfoPtr pScrn)
-                 pSiS->EnablePanel_1366x768 = TRUE;		
-         }
-     }
-+    /* Ignore hotkey flag for video switch, switch on every
-+     * XF86_APM_CAPABILITY_CHANGED event */ 
-+    if(xf86GetOptValBool(pSiS->Options, OPTION_IGNOREHOTKEYFLAG, &val)){
-+        if(val){
-+                xf86DrvMsg(pScrn->scrnIndex, X_INFO,"Ignoring hotkey flag\n");
-+                pSiS->IgnoreHotkeyFlag = TRUE;		
-+        }
-+    }
- 
- }
- 
--- 
-1.5.4.3
-
diff --git a/testing/xf86-video-sisimedia/0007-Remove-useless-loader-symbol-lists.patch b/testing/xf86-video-sisimedia/0007-Remove-useless-loader-symbol-lists.patch
deleted file mode 100644
index 395213375..000000000
--- a/testing/xf86-video-sisimedia/0007-Remove-useless-loader-symbol-lists.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-From ae1a7dcebdac904c8068cc38fb77648c548f5075 Mon Sep 17 00:00:00 2001
-From: Paulo Ricardo Zanoni <pzanoni@mandriva.com>
-Date: Thu, 22 Apr 2010 11:19:29 -0300
-Subject: [PATCH] Remove useless loader symbol lists
-
-Adaption of xf86-video-sis patch 74553b5ee476a0dd28e136f5a33a546ea0c3ef28
----
- src/sis_driver.c |  150 +-----------------------------------------------------
- 1 files changed, 1 insertions(+), 149 deletions(-)
-
-diff --git a/src/sis_driver.c b/src/sis_driver.c
-index d56182f..96255d3 100644
---- a/src/sis_driver.c
-+++ b/src/sis_driver.c
-@@ -227,126 +227,6 @@ static PciChipsets XGIPciChipsets[] = {
-     { -1,                   -1,                 RES_UNDEFINED }
- };
- 
--#ifdef SIS_USE_XAA
--static const char *xaaSymbols[] = {
--    "XAACreateInfoRec",
--    "XAADestroyInfoRec",
--    "XAAHelpPatternROP",
--    "XAAInit",
--    NULL
--};
--#endif
--
--#ifdef SIS_USE_EXA
--static const char *exaSymbols[] = {
--    "exaGetVersion",
--    "exaDriverInit",
--    "exaDriverFini",
--    "exaOffscreenAlloc",
--    "exaOffscreenFree",
--    NULL
--};
--#endif
--
--static const char *fbSymbols[] = {
--    "fbPictureInit",
--    "fbScreenInit",
--    NULL
--};
--
--static const char *shadowSymbols[] = {
--    "ShadowFBInit",
--    NULL
--};
--
--static const char *ramdacSymbols[] = {
--    "xf86CreateCursorInfoRec",
--    "xf86DestroyCursorInfoRec",
--    "xf86InitCursor",
--    NULL
--};
--
--static const char *ddcSymbols[] = {
--    "xf86PrintEDID",
--    "xf86InterpretEDID",
--    NULL
--};
--
--static const char *int10Symbols[] = {
--    "xf86FreeInt10",
--    "xf86InitInt10",
--    NULL
--};
--
--static const char *vbeSymbols[] = {
--#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
--    "VBEInit",
--#else
--    "VBEExtendedInit",
--#endif
--    "vbeDoEDID",
--    "vbeFree",
--    "VBEGetVBEInfo",
--    "VBEFreeVBEInfo",
--    "VBEGetModeInfo",
--    "VBEFreeModeInfo",
--    "VBESaveRestore",
--    "VBESetVBEMode",
--    "VBEGetVBEMode",
--    "VBESetDisplayStart",
--    "VBESetGetLogicalScanlineLength",
--    NULL
--};
--
--#ifdef XF86DRI
--static const char *drmSymbols[] = {
--    "drmAddMap",
--    "drmAgpAcquire",
--    "drmAgpRelease",
--    "drmAgpAlloc",
--    "drmAgpFree",
--    "drmAgpBase",
--    "drmAgpBind",
--    "drmAgpUnbind",
--    "drmAgpEnable",
--    "drmAgpGetMode",
--    "drmCtlInstHandler",
--    "drmCtlUninstHandler",
--    "drmGetInterruptFromBusID",
--#ifndef SISHAVEDRMWRITE
--    "drmSiSAgpInit",
--#else
--    "drmCommandWrite",
--#endif
--#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
--    "drmGetVersion",
--    "drmFreeVersion",
--#endif
--    NULL
--};
--
--static const char *driSymbols[] = {
--    "DRICreateInfoRec",
--    "DRIScreenInit",
--    "DRIFinishScreenInit",
--    "DRIDestroyInfoRec",
--    "DRICloseScreen",
--    "DRIGetSAREAPrivate",
--    "DRILock",
--    "DRIUnlock",
--    "DRIQueryVersion",
--    "GlxSetVisualConfigs",
--    NULL
--};
--
--#ifdef XFree86LOADER
--static const char *driRefSymbols[] = {
--    "DRICreatePCIBusID",  /* not REQUIRED, but eventually referenced */
--    NULL
--};
--#endif
--#endif  /* XF86DRI */
--
- #ifdef XFree86LOADER
- 
- static MODULESETUPPROTO(sisSetup);
-@@ -382,19 +262,6 @@ sisSetup(pointer module, pointer opts, int *errmaj, int *errmin)
-     if(!setupDone) {
-        setupDone = TRUE;
-        xf86AddDriver(&SIS, module, SIS_HaveDriverFuncs);
--       LoaderRefSymLists(fbSymbols,
--#ifdef SIS_USE_XAA
--			 xaaSymbols,
--#endif
--#ifdef SIS_USE_EXA
--			 exaSymbols,
--#endif
--			 shadowSymbols, ramdacSymbols,
--			 vbeSymbols, int10Symbols,
--#ifdef XF86DRI
--			 drmSymbols, driSymbols, driRefSymbols,
--#endif
--			 NULL);
-        return (pointer)TRUE;
-     }
- 
-@@ -1068,7 +935,6 @@ SiS_LoadInitVBE(ScrnInfoPtr pScrn)
-        return;
- 
-     if(xf86LoadSubModule(pScrn, "vbe")) {
--       xf86LoaderReqSymLists(vbeSymbols, NULL);
- #if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
-        pSiS->pVbe = VBEInit(pSiS->pInt, pSiS->pEnt->index);
- #else
-@@ -1092,7 +958,6 @@ SiSLoadInitDDCModule(ScrnInfoPtr pScrn)
-        return TRUE;
- 
-     if(xf86LoadSubModule(pScrn, "ddc")) {
--       xf86LoaderReqSymLists(ddcSymbols, NULL);
-        pSiS->haveDDC = TRUE;
-        return TRUE;
-     }
-@@ -3586,7 +3451,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	  xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- 		"Initializing adapter through int10\n");
- 	  if(xf86LoadSubModule(pScrn, "int10")) {
--	     xf86LoaderReqSymLists(int10Symbols, NULL);
- 	     pSiS->pInt = xf86InitInt10(pSiS->pEnt->index);
- 	  } else {
- 	     SISErrorLog(pScrn, "Failed to load int10 module\n");
-@@ -3683,7 +3547,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-        SISErrorLog(pScrn, "Could not load ramdac module\n");
-        goto my_error_1;
-     }
--    xf86LoaderReqSymLists(ramdacSymbols, NULL);
- 
-     /* Set pScrn->monitor */
-     pScrn->monitor = pScrn->confScreen->monitor;
-@@ -5868,22 +5731,18 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	SISErrorLog(pScrn, "Unsupported framebuffer bpp (%d)\n", pScrn->bitsPerPixel);
- 	goto my_error_1;
-     }
--    xf86LoaderReqSymLists(fbSymbols, NULL);
- 
-     /* Load XAA/EXA (if needed) */
-     if(!pSiS->NoAccel) {
-        char *modName = NULL;
--       const char **symNames = NULL;
- #ifdef SIS_USE_XAA
-        if(!pSiS->useEXA) {
- 	  modName = "xaa";
--	  symNames = xaaSymbols;
-        }
- #endif
- #ifdef SIS_USE_EXA
-        if(pSiS->useEXA) {
- 	  modName = "exa";
--	  symNames = exaSymbols;
-        }
- #endif
-        if(modName && (!xf86LoadSubModule(pScrn, modName))) {
-@@ -5894,9 +5753,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	     pSiS->NoXvideo = TRUE;
- 	  }
- #endif
--       } else if(symNames) {
--	  xf86LoaderReqSymLists(symNames, NULL);
--	  xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled, modename %s\n",modName);
-        }
-     }
- 
-@@ -5909,8 +5765,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	     pSiS->ShadowFB = FALSE;
- 	     pSiS->Rotate = pSiS->Reflect = 0;
- 	  }
--       } else {
--          xf86LoaderReqSymLists(shadowSymbols, NULL);
-        }
-     }
- 
-@@ -5920,9 +5774,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-        if(!xf86LoaderCheckSymbol("DRIScreenInit")) {
- 	  if(xf86LoadSubModule(pScrn, "dri")) {
- 	     if(!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) {
--	        if(xf86LoadSubModule(pScrn, "glx")) {
--		   xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL);
--		} else {
-+	        if(! xf86LoadSubModule(pScrn, "glx")) {
- 		   SISErrorLog(pScrn, "Failed to load glx module\n");
- 		}
- 	     }
--- 
-1.6.4.4
-
diff --git a/testing/xf86-video-sisimedia/0008-update-to-xextproto-7-1-support.patch b/testing/xf86-video-sisimedia/0008-update-to-xextproto-7-1-support.patch
deleted file mode 100644
index 1dcbdf05c..000000000
--- a/testing/xf86-video-sisimedia/0008-update-to-xextproto-7-1-support.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 59ea80738d22c69a2850fd7ff89bd75330cc310b Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 16 Jul 2009 01:55:25 +0000
-Subject: Update to xextproto 7.1 support.
-
-DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers
-need to include dpmsconst.h if xextproto 7.1 is available.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/configure.ac b/configure.ac
-index 089c5fa..f19c1b7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,6 +62,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
- 
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES])
-+PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
-+                  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
-+                  HAVE_XEXTPROTO_71="no")
-+AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
- sdkdir=$(pkg-config --variable=sdkdir xorg-server)
- 
- # Checks for libraries.
-diff --git a/src/sis_driver.c b/src/sis_driver.c
-index ef7b522..a1ced97 100644
---- a/src/sis_driver.c
-+++ b/src/sis_driver.c
-@@ -78,8 +78,13 @@
- 
- #include "globals.h"
- 
-+#ifdef HAVE_XEXTPROTO_71
-+#include <X11/extensions/dpmsconst.h>
-+#else
- #define DPMS_SERVER
- #include <X11/extensions/dpms.h>
-+#endif
-+
- 
- #ifdef XF86DRI
- #include "dri.h"
---
-cgit v0.8.3-6-g21f6
diff --git a/testing/xf86-video-sisimedia/0009-update-for-rac-removal.patch b/testing/xf86-video-sisimedia/0009-update-for-rac-removal.patch
deleted file mode 100644
index df1421798..000000000
--- a/testing/xf86-video-sisimedia/0009-update-for-rac-removal.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 9e1ebb9530bbb71be7fcab9e6f8f9a475be72efe Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Tue, 28 Jul 2009 03:32:37 +0000
-Subject: sis: update for resources/RAC API removal
-
----
-diff --git a/src/sis.h b/src/sis.h
-index 773f709..e859c78 100644
---- a/src/sis.h
-+++ b/src/sis.h
-@@ -77,7 +77,9 @@
- #include "xf86Pci.h"
- #include "xf86Priv.h"
- #include "xf86_OSproc.h"
-+#ifndef XSERVER_LIBPCIACCESS
- #include "xf86Resources.h"
-+#endif
- #include "xf86.h"
- #include "xf86PciInfo.h"
- #include "xf86Cursor.h"
-diff --git a/src/sis_driver.c b/src/sis_driver.c
-index a1ced97..bb11cbb 100644
---- a/src/sis_driver.c
-+++ b/src/sis_driver.c
-@@ -49,7 +49,9 @@
- 
- #include "sis.h"
- 
-+#ifndef XSERVER_LIBPCIACCESS
- #include "xf86RAC.h"
-+#endif
- #include "dixstruct.h"
- #include "shadowfb.h"
- #include "fb.h"
-@@ -3552,6 +3554,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-     SiS_MapVGAMem(pScrn);
- #endif
- 
-+#ifndef XSERVER_LIBPCIACCESS
-     /* Set operating state */
- 
-     /* 1. memory */
-@@ -3581,6 +3584,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-     /* Operations for which I/O access is required */
-     pScrn->racIoFlags = RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
- 
-+#endif
-+
-     /* Load ramdac module */
-     if(!xf86LoadSubModule(pScrn, "ramdac")) {
-        SISErrorLog(pScrn, "Could not load ramdac module\n");
-@@ -4424,6 +4429,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-     xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX (size %ldK)\n",
- 	   (ULong)pSiS->IOAddress, pSiS->mmioSize);
- 
-+#ifndef XSERVER_LIBPCIACCESS
-     /* Register the PCI-assigned resources */
-     if(xf86RegisterResources(pSiS->pEnt->index, NULL, ResExclusive)) {
-        SISErrorLog(pScrn, "PCI resource conflicts detected\n");
-@@ -4435,6 +4441,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-        SISFreeRec(pScrn);
-        return FALSE;
-     }
-+#endif
- 
-     from = X_PROBED;
-     if(pSiS->pEnt->device->videoRam != 0) {
---
-cgit v0.8.3-6-g21f6
diff --git a/testing/xf86-video-sisimedia/0010-change-to-use-abi-version-check.patch b/testing/xf86-video-sisimedia/0010-change-to-use-abi-version-check.patch
deleted file mode 100644
index cb9fd7ea5..000000000
--- a/testing/xf86-video-sisimedia/0010-change-to-use-abi-version-check.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8c3eca873717e877048c2bde345c02b1e9099e50 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Tue, 28 Jul 2009 05:22:41 +0000
-Subject: sis: change to using ABI version check
-
----
-diff --git a/src/sis.h b/src/sis.h
-index e859c78..400b83f 100644
---- a/src/sis.h
-+++ b/src/sis.h
-@@ -77,7 +77,7 @@
- #include "xf86Pci.h"
- #include "xf86Priv.h"
- #include "xf86_OSproc.h"
--#ifndef XSERVER_LIBPCIACCESS
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
- #include "xf86Resources.h"
- #endif
- #include "xf86.h"
-diff --git a/src/sis_driver.c b/src/sis_driver.c
-index bb11cbb..994b02d 100644
---- a/src/sis_driver.c
-+++ b/src/sis_driver.c
-@@ -49,7 +49,7 @@
- 
- #include "sis.h"
- 
--#ifndef XSERVER_LIBPCIACCESS
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
- #include "xf86RAC.h"
- #endif
- #include "dixstruct.h"
---
-cgit v0.8.3-6-g21f6
diff --git a/testing/xf86-video-sisimedia/0011-more-rac-removal.patch b/testing/xf86-video-sisimedia/0011-more-rac-removal.patch
deleted file mode 100644
index 8175dea98..000000000
--- a/testing/xf86-video-sisimedia/0011-more-rac-removal.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nrup xf86-video-sis-0.9.1/src/sis_hwmc.c patched/src/sis_hwmc.c
---- xf86-video-sis-0.9.1/src/sis_hwmc.c	2008-03-04 14:31:10.000000000 -0300
-+++ patched/src/sis_hwmc.c	2010-04-20 17:10:21.073690167 -0300
-@@ -43,7 +43,9 @@ THE USE OR OTHER DEALINGS IN THE SOFTWAR
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
-+#ifndef GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
- #include "xf86Resources.h"
-+#endif
- #include "compiler.h"
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
diff --git a/testing/xf86-video-sisimedia/COPYING b/testing/xf86-video-sisimedia/COPYING
deleted file mode 100644
index d643012d7..000000000
--- a/testing/xf86-video-sisimedia/COPYING
+++ /dev/null
@@ -1,139 +0,0 @@
-Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1) Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2) Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3) The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Copyright (C) 1998, 1999 by Alan Hourihane, Wigan, England.
-Parts Copyright (C) 2001-2005 Thomas Winischhofer, Vienna, Austria.
-
-Licensed under the following terms:
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appears in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and
-and that the name of the copyright holder not be used in advertising
-or publicity pertaining to distribution of the software without specific,
-written prior permission. The copyright holder makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without expressed or implied warranty.
-
-THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
-EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-Copyright (C) 2003 Eric Anholt
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appears in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and
-and that the name of the copyright holder not be used in advertising
-or publicity pertaining to distribution of the software without specific,
-written prior permission. The copyright holder makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without expressed or implied warranty.
-
-THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
-EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-Copyright (C) 2000 by Alan Hourihane, Sychdyn, North Wales, UK.
-Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria
-
-Portions from radeon_dga.c which is
-         Copyright 2000 ATI Technologies Inc., Markham, Ontario, and
-                        VA Linux Systems Inc., Fremont, California.
-
-Licensed under the following terms:
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of the providers not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  The providers make no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without express or implied warranty.
-
-THE PROVIDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL THE PROVIDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-Copyright 2007 George Sapountzis
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the next
-paragraph) shall be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Copyright (C) 1999-2004 by The XFree86 Project, Inc.
-based on code written by Mark Vojkovich
-Copyright (C) 2003-2005 Thomas Winischhofer
-
-Licensed under the following terms:
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appears in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and
-and that the name of the copyright holder not be used in advertising
-or publicity pertaining to distribution of the software without specific,
-written prior permission. The copyright holder makes no representations
-about the suitability of this software for any purpose.  It is provided
-"as is" without expressed or implied warranty.
-
-THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO
-EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
diff --git a/testing/xf86-video-sisimedia/PKGBUILD b/testing/xf86-video-sisimedia/PKGBUILD
deleted file mode 100644
index e33c5962d..000000000
--- a/testing/xf86-video-sisimedia/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 136503 2011-08-30 08:44:57Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-sisimedia
-pkgver=0.9.1
-pkgrel=1
-pkgdesc="X.org SiS 671 video driver"
-arch=(i686 x86_64)
-url="http://www.linuxconsulting.ro/xorg-drivers/"
-license=('custom')
-depends=('glibc' 'sis-dri')
-makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
-conflicts=('xorg-server<1.11.0')
-options=('!libtool')
-source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-0.9.1_20091203.tar.bz2
-        xf86-video-sis-0.9.1-20102701.patch
-        0002-Remove-XFree86-Misc-PassMessage-support.patch
-        0003-Fix-build-with-Werror-format-security.patch
-        0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch
-        0006-Add-IgnoreHotkeyFlag-driver-option.patch
-        xf86-video-sis-0.9.1-dump-regs-after-video-init.patch
-        0007-Remove-useless-loader-symbol-lists.patch
-        0008-update-to-xextproto-7-1-support.patch
-        0009-update-for-rac-removal.patch
-        0010-change-to-use-abi-version-check.patch
-        0011-more-rac-removal.patch
-        0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch
-        0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch
-        0005-Correct-bounds-check-of-blitClip-array-access.patch
-        xserver19.patch
-        COPYING)
-sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430'
-          '61715bb86180decde55a56fad9a12d841c89fbb2'
-          '33fdea57187a2758802bcb9572d3a864aaab4d59'
-          '6f05eae535b099b01c2819e63c68d4489b940267'
-          'a6cb5da9312d32d729ad2619d8ae50cb26ba7d4d'
-          'df728052a89c4152abbe89826756040dac23b624'
-          '4bed1c2455ed447f7053cb0729e99cbe598b3274'
-          'd7802db5c49540ab136e71450cc846cfccd8b8d1'
-          'e2236d2d00338f1658c66d9b972919af39897071'
-          '0c6b9322e6cb22c67e04d50a0b818a2dd4585cf2'
-          '802829a8ebd2b7e35fcc86665d842b1594a8ba30'
-          'c26afe7508183735b7568b435be9c270ceeb62f1'
-          'd2fa2a21454f3a161bcd8ae4d349657561049edd'
-          '5e288526bfa2c534f1feabdb571da16da8a1c7a6'
-          'e86d702cb0b5e9bf43ff732696229965e176db7c'
-          'b5f260bed7e705808ec05620316e503ed5d52ee5'
-          'a64e244f274bcb155f892d0488a1a4b1b2f7d70d')
-
-build() {
-  cd "${srcdir}/xf86-video-sis-${pkgver}"
-  patch -Np1 -i "${srcdir}/xf86-video-sis-0.9.1-20102701.patch"
-  patch -Np1 -i "${srcdir}/0002-Remove-XFree86-Misc-PassMessage-support.patch"
-  patch -Np1 -i "${srcdir}/0003-Fix-build-with-Werror-format-security.patch"
-  patch -Np1 -i "${srcdir}/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch"
-  patch -Np1 -i "${srcdir}/0006-Add-IgnoreHotkeyFlag-driver-option.patch"
-  patch -Np1 -i "${srcdir}/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch"
-  patch -Np1 -i "${srcdir}/0007-Remove-useless-loader-symbol-lists.patch"
-  patch -Np1 -i "${srcdir}/0008-update-to-xextproto-7-1-support.patch"
-  patch -Np1 -i "${srcdir}/0009-update-for-rac-removal.patch"
-  patch -Np1 -i "${srcdir}/0010-change-to-use-abi-version-check.patch"
-  patch -Np1 -i "${srcdir}/0011-more-rac-removal.patch"
-  patch -Np1 -i "${srcdir}/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch"
-  patch -Np1 -i "${srcdir}/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch"
-  patch -Np1 -i "${srcdir}/0005-Correct-bounds-check-of-blitClip-array-access.patch"
-  patch -Np1 -i "${srcdir}/xserver19.patch"
-
-  sed -i -e 's,sis_drv,sisimedia_drv,g' src/Makefile.am
-  sed -i -e 's,\"sis\",\"sisimedia\",g' src/sis.h
-  sed -i -e 's,sisModuleData,sisimediaModuleData,g' src/sis_driver.c
-
-  autoreconf -fi
-
-  ./configure --prefix=/usr --enable-dri
-  make
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/share/man"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-sisimedia/xf86-video-sis-0.9.1-20102701.patch b/testing/xf86-video-sisimedia/xf86-video-sis-0.9.1-20102701.patch
deleted file mode 100644
index 944eceb12..000000000
--- a/testing/xf86-video-sisimedia/xf86-video-sis-0.9.1-20102701.patch
+++ /dev/null
@@ -1,1376 +0,0 @@
-diff -p -up xf86-video-sis-0.9.1/src/sis.h.orig xf86-video-sis-0.9.1/src/sis.h
---- xf86-video-sis-0.9.1/src/sis.h.orig	2010-01-27 15:27:11.000000000 -0500
-+++ xf86-video-sis-0.9.1/src/sis.h	2010-01-27 15:22:42.000000000 -0500
-@@ -98,6 +98,7 @@
- #define XF86_VERSION_CURRENT XF86_VERSION_NUMERIC(4,3,99,902,0)
- #endif
- 
-+#if 0
- /*** Xorg Version Path <= X-Server 2.0 ***/
- /* K.T for xorg 1.3 */
- #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(2,0,0,0,0)
-@@ -109,33 +110,36 @@
- #define NEW_XORG_VERSION 1
- #endif
- #endif
-+#endif
-+#define NEW_XORG_VERSION 1
- 
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,0,0,0)
-+//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,0,0,0)
- #define SIS_HAVE_RR_FUNC
- #ifdef HaveDriverFuncs
- #undef  SIS_HaveDriverFuncs
- #define SIS_HaveDriverFuncs HaveDriverFuncs
- #define SIS_HAVE_DRIVER_FUNC
- #endif /* HaveDriverFuncs */
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0)
-+//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0)
- #define SISISXORG6899900
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,901,0)
-+//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,901,0)
- #define SISISXORG6899901
- #ifdef RANDR
- #define SIS_HAVE_RR_GET_MODE_MM
- #define SIS_HAVE_RANDR_SIZE_PATCH
- #endif /* RANDR */
--#endif /* >= 6.8.99.901 */
--#endif /* >= 6.8.99.900 */
--#endif /* >= 6.8.0.0    */
--#else   /* XORG_VERSION_CURRENT */
--#include "xf86Version.h"
--#define SISMYSERVERNAME "XFree86"
-+//#endif /* >= 6.8.99.901 */
-+//#endif /* >= 6.8.99.900 */
-+//#endif /* >= 6.8.0.0    */
-+//#else   /* XORG_VERSION_CURRENT */
-+//#include "xf86Version.h"
-+//#define SISMYSERVERNAME "XFree86"
- #endif
- 
- /*I.L. modified*/
- //#define NEC_CASE  /*It used the old Xorg_Version with new PCI structure.*/
- 
-+#if 0
- #ifdef XSERVER_LIBPCIACCESS
- #ifdef NEC_CASE
- #define XORG_VERSION_CURRENT (((7) * 10000000) + ((1) * 100000) + ((0) * 1000) + 0)
-@@ -143,6 +147,7 @@
- #define XORG_VERSION_CURRENT (((7) * 10000000) + ((4) * 100000) + ((0) * 1000) + 0)
- #endif
- #endif
-+#endif
- 
- 
- #define SIS_NAME                "SIS"
-@@ -268,16 +273,16 @@
- 
- #undef SISCHECKOSSSE
- #ifdef XORG_VERSION_CURRENT
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)
-+//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)
- #define SISCHECKOSSSE		/* Automatic check OS for SSE; requires SigIll facility */
--#endif
-+//#endif
- #endif
- 
- #undef SISGAMMARAMP
- #ifdef XORG_VERSION_CURRENT
--#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)
-+//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)
- #define SISGAMMARAMP		/* Driver can set gamma ramp; requires additional symbols in xf86sym.h */
--#endif
-+//#endif
- #endif
- 
- #if 0	/* Perhaps for future use */
-@@ -1031,6 +1036,7 @@ typedef struct {
- #endif
-     
-     PCITAG		PciTag;
-+
-     int			PciBus, PciDevice, PciFunc;
-     EntityInfoPtr	pEnt;
-     int			Chipset;
-diff -p -up xf86-video-sis-0.9.1/src/sis300_accel.c.orig xf86-video-sis-0.9.1/src/sis300_accel.c
---- xf86-video-sis-0.9.1/src/sis300_accel.c.orig	2007-05-29 22:12:02.000000000 -0400
-+++ xf86-video-sis-0.9.1/src/sis300_accel.c	2010-01-27 15:21:54.000000000 -0500
-@@ -1231,8 +1231,8 @@ SiS300AccelInit(ScreenPtr pScreen)
- 
- #ifdef SIS_USE_EXA	/* ----------------------- EXA ----------------------- */
- 	   if(pSiS->useEXA) {
--#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
--         
-+//#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#if 0         
- 	      if(pSiS->scrnOffset < 8192) {
- 	         int obase = 0;
- 	         /* data */
-@@ -1430,7 +1430,8 @@ SiS300AccelInit(ScreenPtr pScreen)
- 	      pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 128 * 1024, 16, TRUE,
- 						SiSScratchSave, pSiS);
-     
--    #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+//    #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+    #if 0
-               if(pSiS->exa_scratch) {
- 		 pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
- 		 pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
-diff -p -up xf86-video-sis-0.9.1/src/sis310_accel.c.orig xf86-video-sis-0.9.1/src/sis310_accel.c
---- xf86-video-sis-0.9.1/src/sis310_accel.c.orig	2007-09-29 05:13:12.000000000 -0400
-+++ xf86-video-sis-0.9.1/src/sis310_accel.c	2010-01-27 15:21:54.000000000 -0500
-@@ -65,9 +65,9 @@
- #  define SIS_NEED_ARRAY
- #  undef SISNEWRENDER
- #  ifdef XORG_VERSION_CURRENT
--#   if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0)
-+//#   if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0)
- #    define SISNEWRENDER
--#   endif
-+//#   endif
- #  endif
- # endif
- #endif
-@@ -1463,7 +1463,7 @@ SiSUploadToScratch(PixmapPtr pSrc, Pixma
- 	int dst_pitch, size, w, h, bytes;
- 
- 	w = pSrc->drawable.width;
--
-+/*
- #if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
- 	dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) +
- 		     pSiS->EXADriverPtr->card.offscreenPitch - 1) &
-@@ -1472,17 +1472,17 @@ SiSUploadToScratch(PixmapPtr pSrc, Pixma
- 	dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) +
- 		     pSiS->EXADriverPtr->card.pixmapPitchAlign - 1) &
- 		    ~(pSiS->EXADriverPtr->card.pixmapPitchAlign - 1);
--#else
-+#else*/
- 	dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) +
- 		     pSiS->EXADriverPtr->pixmapPitchAlign - 1) &
- 		    ~(pSiS->EXADriverPtr->pixmapPitchAlign - 1);
- 
--#endif
-+//#endif
- 	size = dst_pitch * pSrc->drawable.height;
- 
- 	if(size > pSiS->exa_scratch->size)
- 	   return FALSE;
--
-+/*
- #if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
- 	pSiS->exa_scratch_next = (pSiS->exa_scratch_next +
- 				  pSiS->EXADriverPtr->card.offscreenByteAlign - 1) &
-@@ -1491,34 +1491,34 @@ SiSUploadToScratch(PixmapPtr pSrc, Pixma
- 	pSiS->exa_scratch_next = (pSiS->exa_scratch_next +
- 				  pSiS->EXADriverPtr->card.pixmapOffsetAlign - 1) &
- 				  ~(pSiS->EXADriverPtr->card.pixmapOffsetAlign - 1);
--#else
-+#else*/
- 	pSiS->exa_scratch_next = (pSiS->exa_scratch_next +
- 				  pSiS->EXADriverPtr->pixmapOffsetAlign - 1) &
- 				  ~(pSiS->EXADriverPtr->pixmapOffsetAlign - 1);
--#endif
--
-+//#endif
-+/*
- #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
- 	if(pSiS->exa_scratch_next + size >
- 	   pSiS->exa_scratch->offset + pSiS->exa_scratch->size) {
- 	   (pSiS->EXADriverPtr->accel.WaitMarker)(pSrc->drawable.pScreen, 0);
- 	   pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
- 	}
--#else
-+#else*/
- 	if(pSiS->exa_scratch_next + size >
- 	   pSiS->exa_scratch->offset + pSiS->exa_scratch->size) {
- 	   (pSiS->EXADriverPtr->WaitMarker)(pSrc->drawable.pScreen, 0);
- 	   pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
- 	}
--#endif
-+//#endif
- 
- 	memcpy(pDst, pSrc, sizeof(*pDst));
- 	pDst->devKind = dst_pitch;
- 
--#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
--	pDst->devPrivate.ptr = pSiS->EXADriverPtr->card.memoryBase + pSiS->exa_scratch_next;
--#else
-+//#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+//	pDst->devPrivate.ptr = pSiS->EXADriverPtr->card.memoryBase + pSiS->exa_scratch_next;
-+//#else
- 	pDst->devPrivate.ptr = pSiS->EXADriverPtr->memoryBase + pSiS->exa_scratch_next;
--#endif
-+//#endif
- 
- 	pSiS->exa_scratch_next += size;
- 
-@@ -1762,7 +1762,8 @@ SiS315AccelInit(ScreenPtr pScreen)
- 
- #ifdef SIS_USE_EXA	/* ----------------------- EXA ----------------------- */
- 	   if(pSiS->useEXA) {
--#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+#if 0
-+//#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
- 
- 	      int obase = 0;
- 
-@@ -1952,11 +1953,11 @@ SiS315AccelInit(ScreenPtr pScreen)
- 						SiSScratchSave, pSiS);
- 	      if(pSiS->exa_scratch) {
- 		 pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
--        #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
--		 pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
--	#else
-+        //#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+	//	 pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
-+	//#else
-                  pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
--        #endif
-+        //#endif
-                }
- 
- 	   } else {
-diff -p -up xf86-video-sis-0.9.1/src/sis_3daccel.c.orig xf86-video-sis-0.9.1/src/sis_3daccel.c
---- xf86-video-sis-0.9.1/src/sis_3daccel.c.orig	2007-08-10 04:22:16.000000000 -0400
-+++ xf86-video-sis-0.9.1/src/sis_3daccel.c	2010-01-27 15:21:54.000000000 -0500
-@@ -64,9 +64,9 @@
- #  define SIS_NEED_ARRAY
- #  undef SISNEWRENDER
- #  ifdef XORG_VERSION_CURRENT
--#   if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0)
-+//#   if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0)
- #    define SISNEWRENDER
--#   endif
-+//#   endif
- #  endif
- # endif
- #endif
-diff -p -up xf86-video-sis-0.9.1/src/sis_accel.c.orig xf86-video-sis-0.9.1/src/sis_accel.c
---- xf86-video-sis-0.9.1/src/sis_accel.c.orig	2007-05-29 22:12:02.000000000 -0400
-+++ xf86-video-sis-0.9.1/src/sis_accel.c	2010-01-27 15:21:54.000000000 -0500
-@@ -781,50 +781,50 @@ SiSAccelInit(ScreenPtr pScreen)
- 
- #ifdef SIS_USE_EXA	/* ----------------------- EXA ----------------------- */
-        if(pSiS->useEXA) {
--#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+//#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
- 
- 	  /* data */
--	  pSiS->EXADriverPtr->card.memoryBase = pSiS->FbBase;
--	  pSiS->EXADriverPtr->card.memorySize = pSiS->maxxfbmem;
--	  pSiS->EXADriverPtr->card.offScreenBase = pScrn->displayWidth * pScrn->virtualY
--						* (pScrn->bitsPerPixel >> 3);
--	  if(pSiS->EXADriverPtr->card.memorySize > pSiS->EXADriverPtr->card.offScreenBase) {
--	     pSiS->EXADriverPtr->card.flags = EXA_OFFSCREEN_PIXMAPS;
--	  } else {
--	     pSiS->NoXvideo = TRUE;
--	     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
--		"Not enough video RAM for offscreen memory manager. Xv disabled\n");
--	  }
--#if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
--	  pSiS->EXADriverPtr->card.offscreenByteAlign = 8;	/* src/dst: double quad word boundary */
--	  pSiS->EXADriverPtr->card.offscreenPitch = 1;
--#else
--	  pSiS->EXADriverPtr->card.pixmapOffsetAlign = 8;	/* src/dst: double quad word boundary */
--	  pSiS->EXADriverPtr->card.pixmapPitchAlign = 8;	/* could possibly be 1, but who knows for sure */
--#endif
--	  pSiS->EXADriverPtr->card.maxX = 2047;
--	  pSiS->EXADriverPtr->card.maxY = 2047;
-+//	  pSiS->EXADriverPtr->card.memoryBase = pSiS->FbBase;
-+//	  pSiS->EXADriverPtr->card.memorySize = pSiS->maxxfbmem;
-+//	  pSiS->EXADriverPtr->card.offScreenBase = pScrn->displayWidth * pScrn->virtualY
-+//						* (pScrn->bitsPerPixel >> 3);
-+//	  if(pSiS->EXADriverPtr->card.memorySize > pSiS->EXADriverPtr->card.offScreenBase) {
-+//	     pSiS->EXADriverPtr->card.flags = EXA_OFFSCREEN_PIXMAPS;
-+//	  } else {
-+//	     pSiS->NoXvideo = TRUE;
-+//	     xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-+//		"Not enough video RAM for offscreen memory manager. Xv disabled\n");
-+//	  }
-+//#if  XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0)
-+//	  pSiS->EXADriverPtr->card.offscreenByteAlign = 8;	/* src/dst: double quad word boundary */
-+//	  pSiS->EXADriverPtr->card.offscreenPitch = 1;
-+//#else
-+//	  pSiS->EXADriverPtr->card.pixmapOffsetAlign = 8;	/* src/dst: double quad word boundary */
-+//	  pSiS->EXADriverPtr->card.pixmapPitchAlign = 8;	/* could possibly be 1, but who knows for sure */
-+//#endif
-+//	  pSiS->EXADriverPtr->card.maxX = 2047;
-+//	  pSiS->EXADriverPtr->card.maxY = 2047;
- 
- 	  /* Sync */
--	  pSiS->EXADriverPtr->accel.WaitMarker = SiSEXASync;
-+//	  pSiS->EXADriverPtr->accel.WaitMarker = SiSEXASync;
- 
- 	  /* Solid fill */
--	  pSiS->EXADriverPtr->accel.PrepareSolid = SiSPrepareSolid;
--	  pSiS->EXADriverPtr->accel.Solid = SiSSolid;
--	  pSiS->EXADriverPtr->accel.DoneSolid = SiSDoneSolid;
-+//	  pSiS->EXADriverPtr->accel.PrepareSolid = SiSPrepareSolid;
-+//	  pSiS->EXADriverPtr->accel.Solid = SiSSolid;
-+//	  pSiS->EXADriverPtr->accel.DoneSolid = SiSDoneSolid;
- 
- 	  /* Copy */
--	  pSiS->EXADriverPtr->accel.PrepareCopy = SiSPrepareCopy;
--	  pSiS->EXADriverPtr->accel.Copy = SiSCopy;
--	  pSiS->EXADriverPtr->accel.DoneCopy = SiSDoneCopy;
-+//	  pSiS->EXADriverPtr->accel.PrepareCopy = SiSPrepareCopy;
-+//	  pSiS->EXADriverPtr->accel.Copy = SiSCopy;
-+//	  pSiS->EXADriverPtr->accel.DoneCopy = SiSDoneCopy;
- 
- 	  /* Composite not supported */
- 
- 	  /* Upload, download to/from Screen */
--	  pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen;
--	  pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen;
-+//	  pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen;
-+//	  pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen;
- 
--#else /*xorg>=7.0*/
-+//#else /*xorg>=7.0*/
- 
- 	  pSiS->EXADriverPtr->exa_major = 2;
- 	  pSiS->EXADriverPtr->exa_minor = 0;
-@@ -867,7 +867,7 @@ SiSAccelInit(ScreenPtr pScreen)
- 
- #endif  /*end of Xorg>=7.0 EXA Setting*/       
-        }
--#endif /* EXA */
-+//#endif /* EXA */
- 
-     }  /* NoAccel */
- 
-@@ -946,11 +946,11 @@ SiSAccelInit(ScreenPtr pScreen)
- 						SiSScratchSave, pSiS);
- 	  if(pSiS->exa_scratch) {
- 	     pSiS->exa_scratch_next = pSiS->exa_scratch->offset;
--       #if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
--             pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
--       #else
-+       //#if  XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0)
-+       //      pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch;
-+       //#else
-              pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch;
--       #endif
-+       //#endif
- 	  }
- 
-        } else {
-diff -p -up xf86-video-sis-0.9.1/src/sis_dri.c.orig xf86-video-sis-0.9.1/src/sis_dri.c
---- xf86-video-sis-0.9.1/src/sis_dri.c.orig	2008-11-04 08:27:14.000000000 -0500
-+++ xf86-video-sis-0.9.1/src/sis_dri.c	2010-01-27 15:21:54.000000000 -0500
-@@ -56,7 +56,8 @@ extern Bool drmSiSAgpInit(int driSubFD, 
- 
- #ifdef XORG_VERSION_CURRENT
- #define SISHAVECREATEBUSID
--#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,7,99,1,0)
-+#if 0
-+//#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,7,99,1,0)
-  /*I.L. modified*/
- #ifndef XSERVER_LIBPCIACCESS
- extern char *DRICreatePCIBusID(pciVideoPtr PciInfo);
-diff -p -up xf86-video-sis-0.9.1/src/sis_driver.c.orig xf86-video-sis-0.9.1/src/sis_driver.c
---- xf86-video-sis-0.9.1/src/sis_driver.c.orig	2009-06-22 08:15:54.000000000 -0400
-+++ xf86-video-sis-0.9.1/src/sis_driver.c	2010-01-27 15:21:54.000000000 -0500
-@@ -140,6 +140,17 @@ static int pix24bpp = 0;
-  * an upper-case version of the driver name.
-  */
- 
-+#if XSERVER_LIBPCIACCESS
-+#define SIS_DEVICE_MATCH(d, i)\
-+    {PCI_VENDOR_SIS, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
-+
-+static const struct pci_id_match SIS_device_match[] = {
-+	SIS_DEVICE_MATCH (PCI_CHIP_SIS670, 0),
-+	SIS_DEVICE_MATCH (PCI_CHIP_SIS671, 0),
-+	{0, 0, 0 },
-+	};
-+#endif
-+
- #ifdef _X_EXPORT
- _X_EXPORT
- #endif
-@@ -147,7 +158,11 @@ DriverRec SIS = {
-     SIS_CURRENT_VERSION,
-     SIS_DRIVER_NAME,
-     SISIdentify,
-+#if XSERVER_LIBPCIACCESS
-+    NULL,
-+#else
-     SISProbe,
-+#endif
-     SISAvailableOptions,
-     NULL,
-     0
-@@ -155,6 +170,11 @@ DriverRec SIS = {
-      ,
-     SISDriverFunc
- #endif
-+#if XSERVER_LIBPCIACCESS
-+    ,
-+    SIS_device_match,
-+    SIS_pci_probe
-+#endif
- };
- 
- static SymTabRec SISChipsets[] = {
-@@ -453,7 +473,94 @@ SISDriverFunc(ScrnInfoPtr pScrn, SISDRIV
- /****************************************************/
- /*                     Probe()                      */
- /****************************************************/
-+static Bool SIS_pci_probe (DriverPtr driver, int entity_num, struct pci_device *device, intptr_t match_data)
-+{
-+    ScrnInfoPtr pScrn;
-+#ifdef SISDUALHEAD
-+    EntityInfoPtr pEnt;
-+    Bool    foundScreen = FALSE;
-+#endif
-+xf86DrvMsg(0, X_INFO, "SIS_pci_probe - begin, entity_num=%d\n", entity_num);
-+xf86DrvMsg(0, X_INFO, "                       vendor_id=0x%x\n", device->vendor_id);
-+xf86DrvMsg(0, X_INFO, "                       device_id=0x%x\n", device->device_id);
-+xf86DrvMsg(0, X_INFO, "                       bus=%d\n", device->bus);
-+xf86DrvMsg(0, X_INFO, "                       dev=%d\n", device->dev);
-+xf86DrvMsg(0, X_INFO, "                       func=%d\n", device->func);
-+    pScrn = NULL;
-+    if((pScrn = xf86ConfigPciEntity(pScrn, 0,
-+			entity_num,
-+			SISPciChipsets,
-+			NULL, NULL, NULL, NULL, NULL))) {
-+	    xf86DrvMsg(0, X_INFO, "SIS_pci_probe - ConfigPciEntity found\n");
-+	    /* Fill in what we can of the ScrnInfoRec */
-+	    pScrn->driverVersion    = SIS_CURRENT_VERSION;
-+	    pScrn->driverName       = SIS_DRIVER_NAME;
-+	    pScrn->name             = SIS_NAME;
-+	    pScrn->Probe            = NULL;//SISProbe;
-+	    pScrn->PreInit          = SISPreInit;
-+	    pScrn->ScreenInit       = SISScreenInit;
-+	    pScrn->SwitchMode       = SISSwitchMode;
-+	    pScrn->AdjustFrame      = SISAdjustFrame;
-+	    pScrn->EnterVT          = SISEnterVT;
-+	    pScrn->LeaveVT          = SISLeaveVT;
-+	    pScrn->FreeScreen       = SISFreeScreen;
-+	    pScrn->ValidMode        = SISValidMode;
-+	    pScrn->PMEvent          = SISPMEvent; /*add PM function for ACPI hotkey,Ivans*/
-+#ifdef X_XF86MiscPassMessage
-+//   if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) {
-+//	       pScrn->HandleMessage = SISHandleMessage;
-+//	    }
-+#endif
-+	    foundScreen = TRUE;
-+	}
-+    #ifdef SISDUALHEAD
-+	pEnt = xf86GetEntityInfo(entity_num);
-+xf86DrvMsg(0, X_INFO, "SIS_pci_probe - GetEntityInfo chipset is 0x%x\n",pEnt->chipset);
-+	switch(pEnt->chipset) {
-+	case PCI_CHIP_SIS300:
-+	case PCI_CHIP_SIS540:
-+	case PCI_CHIP_SIS630:
-+	case PCI_CHIP_SIS550:
-+	case PCI_CHIP_SIS315:
-+	case PCI_CHIP_SIS315H:
-+	case PCI_CHIP_SIS315PRO:
-+	case PCI_CHIP_SIS650:
-+	case PCI_CHIP_SIS330:
-+	case PCI_CHIP_SIS660:
-+	case PCI_CHIP_SIS340:
-+	case PCI_CHIP_SIS670:
-+	case PCI_CHIP_SIS671:
-+	case PCI_CHIP_XGIXG40:
-+	    {
-+	       SISEntPtr pSiSEnt = NULL;
-+	       DevUnion  *pPriv;
-+
-+	       xf86SetEntitySharable(entity_num);
-+	       if(SISEntityIndex < 0) {
-+		  SISEntityIndex = xf86AllocateEntityPrivateIndex();
-+	       }
-+	       pPriv = xf86GetEntityPrivate(pScrn->entityList[0], SISEntityIndex);
-+	       if(!pPriv->ptr) {
-+		  pPriv->ptr = xnfcalloc(sizeof(SISEntRec), 1);
-+		  pSiSEnt = pPriv->ptr;
-+		  memset(pSiSEnt, 0, sizeof(SISEntRec));
-+		  pSiSEnt->lastInstance = -1;
-+	       } else {
-+		  pSiSEnt = pPriv->ptr;
-+	       }
-+	       pSiSEnt->lastInstance++;
-+	       xf86SetEntityInstanceForScreen(pScrn, pScrn->entityList[0],
-+						pSiSEnt->lastInstance);
-+	    }
-+	    break;
- 
-+	default:
-+	    break;
-+	}
-+#endif /* DUALHEAD */
-+xf86DrvMsg(0, X_INFO, "SIS_pci_probe - end\n");
-+    return foundScreen;
-+}
- 
- static Bool
- SISProbe(DriverPtr drv, int flags)
-@@ -464,7 +571,7 @@ SISProbe(DriverPtr drv, int flags)
-     int     numDevSections;
-     int     numUsed, numUsedSiS, numUsedXGI;
-     Bool    foundScreen = FALSE;
--
-+xf86DrvMsg(0, X_INFO, "SISPRobe() begin, flags=%d\n", flags);
-     /*
-      * The aim here is to find all cards that this driver can handle,
-      * and for the ones not already claimed by another driver, claim
-@@ -490,6 +597,7 @@ SISProbe(DriverPtr drv, int flags)
-         * There's no matching device section in the config file, so quit
-         * now.
-         */
-+       xf86DrvMsg(0, X_INFO, "SISProbe - MatchDevice fail\n");
-        return FALSE;
-     }
- 
-@@ -526,14 +634,16 @@ SISProbe(DriverPtr drv, int flags)
-     xfree(devSections);
- 
-     numUsed = numUsedSiS + numUsedXGI;
--
--    if(numUsed <= 0)
-+xf86DrvMsg(0, X_INFO, "SISPRobe - test1\n");
-+    if(numUsed <= 0) {
-+       xf86DrvMsg(0, X_INFO, "SISProbe - MatchPciInstances fail\n");
-        return FALSE;
-+    }
- 
-     if(flags & PROBE_DETECT) {
- 
- 	foundScreen = TRUE;
--
-+	xf86DrvMsg(0, X_INFO, "SISProbe - flags already probe");
-     } else for(i = 0; i < numUsed; i++) {
- 
- 	ScrnInfoPtr pScrn;
-@@ -548,6 +658,7 @@ SISProbe(DriverPtr drv, int flags)
- 			(i < numUsedSiS) ? usedChipsSiS[i] : usedChipsXGI[i-numUsedSiS],
- 			(i < numUsedSiS) ? SISPciChipsets  : XGIPciChipsets,
- 			NULL, NULL, NULL, NULL, NULL))) {
-+	    xf86DrvMsg(0, X_INFO, "SISProbe - ConfigPciEntity found\n");
- 	    /* Fill in what we can of the ScrnInfoRec */
- 	    pScrn->driverVersion    = SIS_CURRENT_VERSION;
- 	    pScrn->driverName       = SIS_DRIVER_NAME;
-@@ -563,16 +674,16 @@ SISProbe(DriverPtr drv, int flags)
- 	    pScrn->ValidMode        = SISValidMode;
- 	    pScrn->PMEvent          = SISPMEvent; /*add PM function for ACPI hotkey,Ivans*/
- #ifdef X_XF86MiscPassMessage
--	    if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) {
--	       pScrn->HandleMessage = SISHandleMessage;
-+   if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) {
-+//	       pScrn->HandleMessage = SISHandleMessage;
- 	    }
- #endif
- 	    foundScreen = TRUE;
- 	}
--
-+xf86DrvMsg(0, X_INFO, "SISProbe - test2\n");
- #ifdef SISDUALHEAD
- 	pEnt = xf86GetEntityInfo((i < numUsedSiS) ? usedChipsSiS[i] : usedChipsXGI[i-numUsedSiS]);
--
-+	xf86DrvMsg(0, X_INFO, "SISProbe - GetEntityInfo done\n");
- 	switch(pEnt->chipset) {
- 	case PCI_CHIP_SIS300:
- 	case PCI_CHIP_SIS540:
-@@ -620,7 +731,7 @@ SISProbe(DriverPtr drv, int flags)
- 
-     if(usedChipsSiS) xfree(usedChipsSiS);
-     if(usedChipsXGI) xfree(usedChipsXGI);
--
-+xf86DrvMsg(0, X_INFO, "SISProbe end\n");
-     return foundScreen;
- }
- 
-@@ -1306,7 +1417,11 @@ SiSReadROM(ScrnInfoPtr pScrn)
- 	     }
- 
- 	     if(readpci) {
-+#ifndef XSERVER_LIBPCIACCESS
- 		xf86ReadPciBIOS(0, pSiS->PciTag, 0, pSiS->BIOS, biossize);
-+#else
-+		pci_device_read_rom(pSiS->PciInfo, pSiS->BIOS);
-+#endif
- 		if(SISCheckBIOS(pSiS, mypciid, mypcivendor, biossize)) {
- 		   found = TRUE;
- 		}
-@@ -2224,8 +2339,7 @@ SiSSetSyncRangeFromEdid(ScrnInfoPtr pScr
-        { 2, 0x04, 56.6 },
-        { 2, 0x02, 60.1 },
-        { 2, 0x01, 80.1 }
--   }; 
--   
-+   };
-    const myvddctiming myvtiming[11] = {
-        { 1, 0x02, 56 },
-        { 1, 0x01, 60 },
-@@ -2240,11 +2354,6 @@ SiSSetSyncRangeFromEdid(ScrnInfoPtr pScr
-        { 2, 0x01, 75 }
-    };
- 
--// PCF
--#ifdef TWDEBUG
--   xf86DrvMsg(0, X_INFO, "SiSSetSyncRangeFromEdid\n");
--#endif
--	
-    if(flag) { /* HSync */
- 
-       for(i = 0; i < 4; i++) {
-@@ -2350,12 +2459,6 @@ SiSSetSyncRangeFromEdid(ScrnInfoPtr pScr
- static Bool
- SiSAllowSyncOverride(SISPtr pSiS, Bool fromDDC, int mfbcrt)
- {
--// PCF
--#ifdef TWDEBUG
--   xf86DrvMsg(0, X_INFO, "SiSAllowSyncOverride\n");   
--#endif
--//   return TRUE;
--   
-    if(!(pSiS->VBFlags2 & VB2_VIDEOBRIDGE)) return FALSE;
- 
- #ifdef SISDUALHEAD
-@@ -2382,11 +2485,10 @@ SiSAllowSyncOverride(SISPtr pSiS, Bool f
-    }
- #endif
- 
--// PCF
--//   if(!(pSiS->VBFlags & DISPTYPE_CRT1)) {
-+   if(!(pSiS->VBFlags & DISPTYPE_CRT1)) {
-       if( (pSiS->VBFlags & CRT2_TV) ||
- 	  ((pSiS->VBFlags & CRT2_LCD) && (!fromDDC)) ) return TRUE;
--//   } else if((pSiS->VBFlags & CRT1_LCDA) && (!fromDDC)) return TRUE;
-+   } else if((pSiS->VBFlags & CRT1_LCDA) && (!fromDDC)) return TRUE;
- 
-    return FALSE;
- }
-@@ -2394,8 +2496,6 @@ SiSAllowSyncOverride(SISPtr pSiS, Bool f
- static Bool
- SiSCheckForH(float hsync, MonPtr monitor)
- {
--
--
-    int i;
-    for(i = 0; i < monitor->nHsync; i++) {
-       if((hsync > monitor->hsync[i].lo * (1.0 - SYNC_TOLERANCE)) &&
-@@ -2409,7 +2509,6 @@ SiSCheckForH(float hsync, MonPtr monitor
- static Bool
- SiSCheckForV(float vrefresh, MonPtr monitor)
- {
--
-    int i;
-    for(i = 0; i < monitor->nVrefresh; i++) {
-       if((vrefresh > monitor->vrefresh[i].lo * (1.0 - SYNC_TOLERANCE)) &&
-@@ -2424,21 +2523,11 @@ static Bool
- SiSCheckAndOverruleH(ScrnInfoPtr pScrn, MonPtr monitor)
- {
-    DisplayModePtr mode = monitor->Modes;
--// PCF
-    float mymin = 30.0, mymax = 80.0, hsync;
--
-    Bool doit = FALSE;
- 
--// PCF
--#ifdef TWDEBUG
--   xf86DrvMsg(0, X_INFO, "SiSCheckAndOverruleH\n");
--#endif
-- 	
-    for(hsync = mymin; hsync <= mymax; hsync += .5) {
--      if(!SiSCheckForH(hsync, monitor)) 
--      {
--      	doit = TRUE;
--      }
-+      if(!SiSCheckForH(hsync, monitor)) doit = TRUE;
-    }
- 
-    if(mode) {
-@@ -2461,7 +2550,6 @@ SiSCheckAndOverruleH(ScrnInfoPtr pScrn, 
-       return TRUE;
-    }
- 
--
-    return FALSE;
- }
- 
-@@ -2469,20 +2557,11 @@ static Bool
- SiSCheckAndOverruleV(ScrnInfoPtr pScrn, MonPtr monitor)
- {
-    DisplayModePtr mode = monitor->Modes;
--// PCF
--   float mymin = 57.0, mymax = 63.0, vrefresh;
-+   float mymin = 59.0, mymax = 61.0, vrefresh;
-    Bool doit = FALSE, ret = FALSE;
--   
--// PCF
--#ifdef TWDEBUG
--   xf86DrvMsg(0, X_INFO, "SiSCheckAndOverruleV\n");
--#endif
- 
-    for(vrefresh = mymin; vrefresh <= mymax; vrefresh += 1.0) {
--      if(!SiSCheckForV(vrefresh, monitor)) 
--      {
--      	doit = TRUE;
--      }
-+      if(!SiSCheckForV(vrefresh, monitor)) doit = TRUE;
-    }
- 
-    if(mode) {
-@@ -2515,7 +2594,6 @@ SiSCheckAndOverruleV(ScrnInfoPtr pScrn, 
-       monitor->nVrefresh++;
-       ret = TRUE;
-    }
--
-    return ret;
- }
- 
-@@ -2529,11 +2607,6 @@ SiSFixupHVRanges(ScrnInfoPtr pScrn, int 
-     static const char *saneh = "Correcting %s CRT%d monitor HSync range\n";
-     static const char *sanev = "Correcting %s CRT%d monitor VRefresh range\n";
-     int crtnum;
--    
--// PCF
--#ifdef TWDEBUG
--    xf86DrvMsg(0, X_INFO, "SiSFixupHVRanges\n");
--#endif
- 
- #ifdef SISDUALHEAD
-     if(pSiS->DualHeadMode) {
-@@ -2610,8 +2683,7 @@ SiSFixupHVRanges(ScrnInfoPtr pScrn, int 
- 	  }
-        }
-     }
--// PCF
--//    return TRUE;
-+
-     return freqoverruled;
- }
- 
-@@ -2623,11 +2695,6 @@ SiSMakeOwnModeList(ScrnInfoPtr pScrn, Bo
-                    Bool isfordvi, Bool *havecustommodes, Bool fakecrt2modes, Bool IsForCRT2)
- {
-     DisplayModePtr tempmode, delmode, mymodes;
--    
--    // PCF
--#ifdef TWDEBUG
--    xf86DrvMsg(0, X_INFO, "SiSMakeOwnModeList\n");
--#endif
- 
-     if((mymodes = SiSBuildBuiltInModeList(pScrn, includelcdmodes, isfordvi, fakecrt2modes, IsForCRT2))) {
-        if(!acceptcustommodes) {
-@@ -2676,11 +2743,6 @@ SiSSetupModeListParmsCRT1(SISPtr pSiS, u
- 		Bool *acceptcustommodes, Bool *includelcdmodes, Bool *isfordvi,
- 		Bool *fakecrt2modes, Bool *IsForCRT2, Bool *AllowInterlace)
- {
--// PCF
--#ifdef TWDEBUG
--    xf86DrvMsg(0, X_INFO, "SiSSetupModeListParmsCRT1\n");
--#endif
-- 	
-     (*acceptcustommodes) = TRUE;  /* Accept user modelines */
-     (*includelcdmodes)   = TRUE;  /* Include modes reported by DDC */
-     (*isfordvi)          = FALSE; /* Is for digital DVI output */
-@@ -2815,11 +2877,6 @@ SiSReplaceModeList(ScrnInfoPtr pScrn, Cl
-      *   -) crt2 device is not TV, and
-      *   -) crt1 is not LCDA, unless bridge is TMDS/LCDA capable (301C)
-      */
--// PCF
--#ifdef TWDEBUG
--    xf86DrvMsg(0, X_INFO, "SiSReplaceModeList\n");
--#endif
-- 	
- 
-     if((pSiS->VGAEngine == SIS_300_VGA) || (pSiS->VGAEngine == SIS_315_VGA)) {
- 
-@@ -2881,11 +2938,6 @@ SiSClearModesPrivate(DisplayModePtr mode
- {
-     DisplayModePtr tempmode;
- 
--// PCF
--#ifdef TWDEBUG
--    xf86DrvMsg(0, X_INFO, "SiSClearModesPrivate\n");
--#endif
--
-     /* Make sure that the Private field is NULL */
-     /* (This way we don't have to care for MergedFB
-      * when freeing the mode; just check the Private
-@@ -2904,11 +2956,6 @@ SiSDuplicateMode(DisplayModePtr source)
- {
-     DisplayModePtr dest = NULL;
- 
--// PCF
--#ifdef TWDEBUG
--    xf86DrvMsg(0, X_INFO, "SiSDuplicateMode\n");
--#endif
--    
-     if(source) {
-        if((dest = xalloc(sizeof(DisplayModeRec)))) {
- 	  memcpy(dest, source, sizeof(DisplayModeRec));
-@@ -2972,11 +3019,6 @@ SiSBuildVesaModeList(ScrnInfoPtr pScrn, 
-     SISPtr pSiS = SISPTR(pScrn);
-     int i = 0;
- 
--// PCF
--#ifdef TWDEBUG
--    xf86DrvMsg(0, X_INFO, "SiSBuildVesaModeList\n");
--#endif
-- 	
-     while(vbe->VideoModePtr[i] != 0xffff) {
-        sisModeInfoPtr m;
-        VbeModeInfoBlock *mode;
-@@ -3014,7 +3056,7 @@ SiSSetMinMaxPixelClock(ScrnInfoPtr pScrn
- {
-     SISPtr pSiS = SISPTR(pScrn);
-     MessageType from;
--    
-+
-     /* Set the min pixel clock */
-     pSiS->MinClock = 5000;
-     if((pSiS->VGAEngine == SIS_300_VGA) || (pSiS->VGAEngine == SIS_315_VGA)) {
-@@ -3061,11 +3103,6 @@ SiSRemoveUnsuitableModes(ScrnInfoPtr pSc
-     int maxUsedClock = 0;
-     static const char *notsuitablestr = "Not using mode \"%s\" (not suitable for %s mode)\n";
- 
--// PCF
--#ifdef TWDEBUG
--    xf86DrvMsg(0, X_INFO, "SiSRemoveUnsuitableModes\n");
--#endif
-- 	
-     if((p = first = initial)) {
- 
-        do {
-@@ -3222,11 +3259,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-     static const char *crtsetupstr = "*************************** CRT%d setup ***************************\n";
- #endif
- 
--// PCF
--#ifdef TWDEBUG
--    xf86DrvMsg(0, X_INFO, "SISPreInit Start\n");
--#endif
--
-     if(flags & PROBE_DETECT) {
- 
-        vbeInfoPtr   pVbe;
-@@ -4716,10 +4748,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	         mymax = 8192 * 1024;
- 	      else if(total <= 32768)			/* <= 32MB: Use 16MB for X */
- 	         mymax = 16384 * 1024;
--	      else
--// PCF					/* Otherwise: Use 20MB for X */
--//	         mymax = 20 * 1024 * 1024;
--		 mymax = 20 * 1024 *1024;		
-+	      else					/* Otherwise: Use 20MB for X */
-+	         mymax = 20 * 1024 * 1024;
- 	      /* availMem is right now adjusted to not use the UMA
- 	       * area. Make sure that our default doesn't reach
- 	       * into the UMA area either.
-@@ -4758,9 +4788,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 	         if(pScrn->videoRam <= 65536)
- 	            pSiS->maxxfbmem = 16384 * 1024;	/* On >=315 series and <=64MB, use 16MB */
- 		 else
--// PCF
--//		    pSiS->maxxfbmem = 20 * 1024 * 1024;	/* On >=315 series and > 64MB, use 20MB */
--		    pSiS->maxxfbmem = 20 * 1024 * 1024;
-+		    pSiS->maxxfbmem = 20 * 1024 * 1024;	/* On >=315 series and > 64MB, use 20MB */
- 	      } else
- 	         pSiS->maxxfbmem = 12288 * 1024;	/* On <315 series, use 12MB */
- 
-@@ -4980,7 +5008,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-      *   via CRT2.)
-      *   (TODO: This might need some modification for the
-      *   307 bridges, if these are capable of driving
--     *   LCDs > via channel B)
-+     *   LCDs > 1600 via channel B)
-      */
-     if((pSiS->SiS_SD_Flags & SiS_SD_SUPPORTLCDA) &&
-        (pSiS->VBFlags & CRT2_LCD) &&
-@@ -4995,10 +5023,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 		*/
- 		if(pSiS->ChipType < SIS_662 || pSiS->ChipType >= XGI_20)	pSiS->ForceCRT1Type = CRT1_LCDA;
- 	     pSiS->ForceCRT2Type = CRT2_TV;
--// PCF
--//	  } else if(pSiS->LCDwidth > 1600) {
--	  } else if(pSiS->LCDwidth > 1920) {
--
-+	  } else if(pSiS->LCDwidth > 1600) {
- 	     /* If LCD is > 1600, default to LCDA if we don't need CRT1/VGA for other head */
- 	     Bool NeedCRT1VGA = FALSE;
- #ifdef SISDUALHEAD
-@@ -5591,11 +5616,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-     clockRanges->minClock = pSiS->MinClock;
-     clockRanges->maxClock = pSiS->MaxClock;
-     clockRanges->clockIndex = -1;               /* programmable */
--// PCF
--//    clockRanges->interlaceAllowed = TRUE;
--//    clockRanges->doubleScanAllowed = TRUE;
--    clockRanges->interlaceAllowed = FALSE;
--    clockRanges->doubleScanAllowed = FALSE;
-+    clockRanges->interlaceAllowed = TRUE;
-+    clockRanges->doubleScanAllowed = TRUE;
- 
-     /* Replace default mode list */
-     SiSReplaceModeList(pScrn, clockRanges, FALSE);
-@@ -5623,11 +5645,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-           break;
-        case SIS_300_VGA:
-        case SIS_315_VGA:
--// PCF
-           maxpitch = 4088;
--          maxheight = 4096;	
--//	  maxpitch = 1600;
--//        maxheight = 1200;
-+          maxheight = 4096;
-           break;
-        default:
-           maxpitch = 2048;
-@@ -5688,12 +5707,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-           pScrn->monitor->DDC = NULL;
-        }
- #endif
--// PCF
--#ifdef TWDEBUG
--       xf86DrvMsg(0, X_INFO,"xf86ValidateModes Start\n");
--       xf86DrvMsg(0, X_INFO,"virtualX = %d, virtualY = %d, maxpitch = %d, maxheight = %d, maxxfbmem = %ld \n",
--       	  	  pScrn->display->virtualX,pScrn->display->virtualY,maxpitch,maxheight,pSiS->maxxfbmem/1024);
--#endif
-+
-        i = xf86ValidateModes(pScrn,
- 			pScrn->monitor->Modes,
- 			pScrn->display->modes,
-@@ -5703,13 +5717,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- 			pScrn->bitsPerPixel * 8,
- 			minheight, maxheight,
- 			pScrn->display->virtualX,
--			pScrn->display->virtualY,		
-+			pScrn->display->virtualY,
- 			pSiS->maxxfbmem,
- 			LOOKUP_BEST_REFRESH);
--// PCF
--#ifdef TWDEBUG	
--       xf86DrvMsg(0, X_INFO,"xf86ValidateModes End\n");
--#endif
- 
-        pScrn->monitor->DDC = backupddc;
-     }
-@@ -5745,28 +5755,17 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
- #endif
- 
-     /* Prune the modes marked as invalid */
--// PCF
--//    xf86DrvMsg(0, X_INFO,"xf86PruneDriverModes Start\n");
-     xf86PruneDriverModes(pScrn);
--//    xf86DrvMsg(0, X_INFO,"xf86PruneDriverModes End\n");
-- 
- 
-     if(i == 0 || pScrn->modes == NULL) {
-        SISErrorLog(pScrn, "No valid modes found - check VertRefresh/HorizSync\n");
-        goto my_error_1;
-     }
- 
--// PCF
--//    xf86DrvMsg(0, X_INFO,"xf86SetCrtcForModes Start\n");
-     xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V);
--//    xf86DrvMsg(0, X_INFO,"xf86SetCrtcForModes End\n");
--  
- 
-     /* Clear the modes' Private field */
--// PCF
--//    xf86DrvMsg(0, X_INFO,"SiSClearModesPrivate Start\n");
-     SiSClearModesPrivate(pScrn->modes);
--//    xf86DrvMsg(0, X_INFO,"SiSClearModesPrivate End\n");
- 
-     /* Save virtualX/Y calculated by ValidateModes
-      * and overwrite them with our values assumed to
-@@ -5823,23 +5822,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-        }
- 
-        if(usemyprint) {
--// PCF
--#ifdef TWDEBUG
--          xf86DrvMsg(0, X_INFO,"SiSPrintModes Start\n");
--#endif
- 	  SiSPrintModes(pScrn, printfreq);
--#ifdef TWDEBUG
--          xf86DrvMsg(0, X_INFO,"SiSPrintModes End\n");
--#endif
-        } else {
--// PCF
--#ifdef TWDEBUG
--          xf86DrvMsg(0, X_INFO,"xf86PrintModes Start\n");
--#endif
- 	  xf86PrintModes(pScrn);
--#ifdef TWDEBUG
--	  xf86DrvMsg(0, X_INFO,"xf86PrintModes End\n");
--#endif
-        }
-     }
- 
-@@ -6072,10 +6057,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
-     	
-     /*xf86DrvMsg(0,X_INFO,"CurrentMode=%d. \n",pSiS->Hkey_Device_Switch_State);
-     xf86DrvMsg(0,X_INFO,"Init_VBFlags=0X%x. \n",pSiS->VBFlags);*/
--// PCF
--#ifdef TWDEBUG  
--    xf86DrvMsg(0,X_INFO,"SISPreInit End\n");   
--#endif
-+    
-     return TRUE;
- 
-     /* ---- */
-@@ -7523,9 +7505,7 @@ SiSPreSetMode(ScrnInfoPtr pScrn, Display
-     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, SISVERBLEVEL, "VBFlags=0x%x\n", pSiS->VBFlags);
- 
-     CR30 = 0x00;
--// PCF
--//    CR31 &= ~0x60;  /* Clear VB_Drivermode & VB_OutputDisable */
--    CR31 &= ~0x20;  /* Clear VB_Drivermode & VB_OutputDisable */
-+    CR31 &= ~0x60;  /* Clear VB_Drivermode & VB_OutputDisable */
-     CR31 |= 0x04;   /* Set VB_NotSimuMode (not for 30xB/1400x1050?) */
-     CR35 = 0x00;
- 
-@@ -8633,11 +8613,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
-     SISEntPtr pSiSEnt = NULL;
- #endif
- 
--// PCF 
--#ifdef TWDEBUG 
--    xf86DrvMsg(0, X_INFO,"SISModeInit\n");
--#endif
--   
-     andSISIDXREG(SISCR,0x11,0x7f);	/* Unlock CRTC registers */
- 
-     SISModifyModeInfo(mode);		/* Quick check of the mode parameters */
-@@ -8647,14 +8622,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
-     }
- 
-     if(pSiS->UseVESA) {  /* With VESA: */
--// PCF   
--#ifdef TWDEBUG 
--    	xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n");  
--    	xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n");   
--    	xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n");   
--    	xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n");   
--    	xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n");     	
--#endif
- 
- #ifdef SISDUALHEAD
-        /* No dual head mode when using VESA */
-@@ -8679,7 +8646,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
- 	  SISErrorLog(pScrn, "SiSSetVESAMode() failed\n");
- 	  return FALSE;
-        }
--       
-        sisSaveUnlockExtRegisterLock(pSiS, NULL, NULL);
-        if(pSiS->VGAEngine == SIS_300_VGA || pSiS->VGAEngine == SIS_315_VGA) {
- 	  SiSPreSetMode(pScrn, mode, SIS_MODE_SIMU);
-@@ -8697,21 +8663,11 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
-        SiSVGAProtect(pScrn, TRUE);
-        (*pSiS->SiSRestore)(pScrn, &pSiS->ModeReg);
-        SiSVGAProtect(pScrn, FALSE);
--//       xf86DrvMsg(0, X_INFO,"VESA DualHeadMode SetMode\n");
-+
-     } else { /* Without VESA: */
--// PCF
--#ifdef TWDEBUG
--       xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n");	
--       xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n");	
--       xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n");	
--       xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n");	
--       xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n");	
--#endif
- 
- #ifdef SISDUALHEAD
-        if(pSiS->DualHeadMode) {
--       	
--       	  xf86DrvMsg(0, X_INFO,"SISModeInit DualHeadMode\n");	  
- 
- 	  if(!(*pSiS->ModeInit)(pScrn, mode)) {
- 	     SISErrorLog(pScrn, "ModeInit() failed\n");
-@@ -8730,10 +8686,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
- 		SISErrorLog(pScrn, "SiSBIOSSetModeCRT2() failed\n");
- 		return FALSE;
- 	     }
--// PCF
--#ifdef TWDEBUG
--	     xf86DrvMsg(0, X_INFO,"DualHeadMode SetCRT2\n");
--#endif	     
- 	     SiSPostSetMode(pScrn, &pSiS->ModeReg);
- 	     if(pSiSEnt->pScrn_2) {
- 	        /* No need to go through pScrn->AdjustFrame; the coords
-@@ -8752,11 +8704,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
- 		SISErrorLog(pScrn, "SiSBIOSSetModeCRT1() failed\n");
- 		return FALSE;
- 	     }
--// PCF
--#ifdef TWDEBUG
--     	     xf86DrvMsg(0, X_INFO,"DualHeadMode SetCRT1\n");
--#endif
--
- 	     SiS_SiSLVDSBackLight(pSiS, TRUE);
- 	     SiSPostSetMode(pScrn, &pSiS->ModeReg);
- 	     if(pSiSEnt->pScrn_1) {
-@@ -8771,20 +8718,8 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
- 
-        } else {
- #endif
--// PCF
--#ifdef TWDEBUG
--       	  xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); 
--       	  xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); 	       	
--       	  xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); 	       	
--       	  xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); 	       	
--       	  xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); 	       	  	
--#endif
- 
- 	  if(pSiS->VGAEngine == SIS_300_VGA || pSiS->VGAEngine == SIS_315_VGA) {
--// PCF
--#ifdef TWDEBUG  
--             xf86DrvMsg(0, X_INFO,"SISModeInit SIS_315_VGA\n"); 	       	  	
--#endif
- 
- 	     if(!(*pSiS->ModeInit)(pScrn, mode)) {
- 		SISErrorLog(pScrn, "ModeInit() failed\n");
-@@ -8795,10 +8730,7 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
- 
- #ifdef SISMERGED
- 	     if(pSiS->MergedFB) {
--// PCF
--#ifdef TWDEBUG     	
--        	xf86DrvMsg(0, X_INFO,"SISModeInit SISMERGED\n"); 	       	
--#endif
-+
- 		xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Setting MergedFB mode %dx%d\n",
- 				mode->HDisplay, mode->VDisplay);
- 
-@@ -8813,10 +8745,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
- 		   SISErrorLog(pScrn, "SiSBIOSSetModeCRT1() failed\n");
- 		   return FALSE;
- 		}
--// PCF
--#ifdef TWDEBUG
--    	        xf86DrvMsg(0, X_INFO,"SISMERGED SetCRT1\n");	
--#endif
- 
- 		SiSPreSetMode(pScrn, mode, SIS_MODE_CRT2);
- 
-@@ -8827,10 +8755,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
- 		   SISErrorLog(pScrn, "SiSBIOSSetModeCRT2() failed\n");
- 		   return FALSE;
- 		}
--// PCF
--#ifdef TWDEBUG
--    	        xf86DrvMsg(0, X_INFO,"SISMERGED SetCRT2\n");	
--#endif
- 
- 		SiS_SiSLVDSBackLight(pSiS, TRUE);
- 
-@@ -8838,25 +8762,9 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
- 
- 	     } else {
- #endif
--// PCF
--#ifdef TWDEBUG
--        	xf86DrvMsg(0, X_INFO,"SISModeInit Not SISMERGED\n"); 	       	
--#endif
- 
- 		if((pSiS->VBFlags & CRT1_LCDA) || (!(mode->type & M_T_DEFAULT))) {
--// PCF               	   
--#ifdef TWDEBUG
-- 		   xf86DrvMsg(0, X_INFO,"SISModeInit #1\n"); 
--		   if(pSiS->VBFlags & CRT1_LCDA)
--		   {
--		   	xf86DrvMsg(0, X_INFO,"SISModeInit #1 LCDA\n");
-- 	       		
--         	   }
--         	   else
--         	   {         	   	
--         		xf86DrvMsg(0, X_INFO,"SISModeInit #1 LCDB\n");
--         	   }     	   			   
--#endif
-+
- 		   pSiS->SiS_Pr->SiS_EnableBackLight = FALSE;
- 
- 		   SiSPreSetMode(pScrn, mode, SIS_MODE_CRT1);
-@@ -8867,10 +8775,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
- 		      SISErrorLog(pScrn, "SiSBIOSSetModeCRT1() failed\n");
- 		      return FALSE;
- 		   }
--// PCF
--#ifdef TWDEBUG
-- 		   xf86DrvMsg(0, X_INFO,"NoVESA SetCRT1\n");	
--#endif
- 
- 		   SiSPreSetMode(pScrn, mode, SIS_MODE_CRT2);
- 
-@@ -8880,28 +8784,10 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
- 		      SISErrorLog(pScrn, "SiSBIOSSetModeCRT2() failed\n");
- 		      return FALSE;
- 		   }
--// PCF
--#ifdef TWDEBUG		 
--    		   xf86DrvMsg(0, X_INFO,"NoVESA SetCRT2\n");	
--#endif    		   
--
- 
- 		   SiS_SiSLVDSBackLight(pSiS, TRUE);
- 
- 		} else {
--// PCF
--#ifdef TWDEBUG		
--               	   xf86DrvMsg(0, X_INFO,"SISModeInit #2\n"); 	       	
--		
--                   if(pSiS->VBFlags & CRT1_LCDA)
--		   {
--		   	xf86DrvMsg(0, X_INFO,"SISModeInit #2 LCDA\n"); 	       		
--         	   }
--         	   else
--         	   {
--         	   	xf86DrvMsg(0, X_INFO,"SISModeInit #2 LCDB\n"); 	       		
--         	   }     
--#endif              	  	   			
- 
- 		   pSiS->SiS_Pr->SiS_EnableBackLight = TRUE;
- 
-@@ -8918,11 +8804,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
- #ifdef SISMERGED
- 	     }
- #endif
--// PCF
--#ifdef TWDEBUG		
--             xf86DrvMsg(0, X_INFO,"SISModeInit #3\n"); 	       	
--#endif             
--
- 	     SiSPostSetMode(pScrn, &pSiS->ModeReg);
- #ifdef TWDEBUG
- 	     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VBFlags %lx\n", pSiS->VBFlags);
-@@ -8932,10 +8813,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo
- #endif
- 
- 	  } else {
--// PCF
--#ifdef TWDEBUG			  	
--	  	xf86DrvMsg(0, X_INFO,"SISModeInit Old method\n"); 	       
--#endif	  
- 
- 	     /* For other chipsets, use the old method */
- 
-@@ -9147,7 +9024,7 @@ SISSaveScreenDH(ScreenPtr pScreen, int m
- static void
- SISDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags)
- {
--	   SISPtr pSiS = SISPTR(pScrn);
-+    SISPtr pSiS = SISPTR(pScrn);
-     Bool   docrt1 = TRUE, docrt2 = TRUE, backlight = TRUE;
-     UChar  sr1=0, cr17=0, cr63=0, pmreg=0, sr7=0;
-     UChar  p1_13=0, p2_0=0, oldpmreg=0;
-@@ -10237,7 +10114,6 @@ SISScreenInit(int scrnIndex, ScreenPtr p
- static Bool
- SiSValidLCDUserMode(SISPtr pSiS, unsigned int VBFlags, DisplayModePtr mode, Bool isforlcda)
- {
--
-    if(mode->Flags & V_INTERLACE) return FALSE;
- 
-    if(mode->HDisplay > 2048) return FALSE;
-@@ -10352,7 +10228,7 @@ SiS_CheckModeCRT1(ScrnInfoPtr pScrn, Dis
-       }
- 
-    }
--  
-+
-    return(SiS_GetModeID(pSiS->VGAEngine, VBFlags, mode->HDisplay, mode->VDisplay,
-    			i, pSiS->FSTN, pSiS->LCDwidth, pSiS->LCDheight));
- }
-@@ -10370,12 +10246,8 @@ SiS_CheckModeCRT2(ScrnInfoPtr pScrn, Dis
-    xf86DrvMsg(0, X_INFO, "Inside CheckCalcModeIndex (VBFlags %lx, mode %dx%d)\n",
- 	VBFlags,mode->HDisplay, mode->VDisplay);
- #endif
-+
-    if(VBFlags & CRT2_LCD) {			/* CRT2 is LCD */
--  
--// PCF
--#ifdef TWDEBUG
--      xf86DrvMsg(0, X_INFO, "SiS_CheckModeCRT2 LCDwidth= %d, LCDheight= %d\n",pSiS->LCDwidth,pSiS->LCDheight);
--#endif
- 
-       if((pSiS->VBFlags2 & VB2_SISTMDSBRIDGE) && (!(pSiS->VBFlags2 & VB2_30xBDH))) {
- 
-@@ -10403,7 +10275,6 @@ SiS_CheckModeCRT2(ScrnInfoPtr pScrn, Dis
-             return 0xfe;
- 
-       }
--// PCF
- 
-       if( ((mode->HDisplay <= pSiS->LCDwidth) &&
-            (mode->VDisplay <= pSiS->LCDheight)) ||
-@@ -10415,15 +10286,11 @@ SiS_CheckModeCRT2(ScrnInfoPtr pScrn, Dis
- 	   (((mode->HDisplay == 1024) && (mode->HDisplay == 768)) ||
- 	    ((mode->HDisplay ==  800) && (mode->HDisplay == 600)))) ||
- 	   ((pSiS->EnablePanel_1366x768)&&(pSiS->LCDwidth==1366)&&(mode->HDisplay==1368))) {/*let 1366x768 mode valid. Ivans@090109*/
--/*
--      if( (mode->HDisplay <= pSiS->LCDwidth) &&
--          (mode->VDisplay <= pSiS->LCDheight)) {
--*/
-+
- 	 ModeIndex = SiS_GetModeID_LCD(pSiS->VGAEngine, VBFlags, mode->HDisplay, mode->VDisplay, i,
- 				pSiS->FSTN, pSiS->SiS_Pr->SiS_CustomT, pSiS->LCDwidth, pSiS->LCDheight,
- 				pSiS->VBFlags2);
--// PCF
--//	 xf86DrvMsg(0, X_INFO, "SiS_CheckModeCRT2 LCDwidth= %d, LCDheight= %d, ModeID= %x\n",pSiS->LCDwidth,pSiS->LCDheight,ModeIndex);
-+
-       }
- 
-    } else if(VBFlags & CRT2_TV) {		/* CRT2 is TV */
-@@ -10514,7 +10381,7 @@ SISValidMode(int scrnIndex, DisplayModeP
- 	  if(SiS_CheckModeCRT2(pScrn, mode, pSiS->VBFlags,
- 			pSiS->VBFlags3, pSiS->HaveCustomModes) < 0x14){
- 	       #ifdef TWDEBUG
--		  xf86DrvMsg(0,X_INFO,"[SISValidMode()]: else condition. passing CheckModeCRT2 and MODE_Fail.\n");
-+		  xf86DrvMsg(0,X_INFO,"[SISValidMode()]: else condition. passing CheckModeCRT2 and MODE_OK.\n");
- 	       #endif	  
- 	       return MODE_BAD;
- 	  }
-@@ -10629,18 +10496,12 @@ SISSwitchMode(int scrnIndex, DisplayMode
-     * (In non-MergedFB mode this is also here in order
-     * to get a cheap update of the HWCursor image)
-     */
--    
--// PCF
--#ifdef TWDEBUG
--    xf86DrvMsg(0,X_INFO,"SISSwitchMode\n");
--#endif
- 
-     if(!pSiS->skipswitchcheck) {
-        if(SISValidMode(scrnIndex, mode, TRUE, flags) != MODE_OK) {
-           return FALSE;
-        }
-     }
--    
- /* Mark for 3D full-screen bug */
- /*
- #ifdef XF86DRI    
-@@ -11510,12 +11371,6 @@ SISHotkeySwitchMode(ScrnInfoPtr pScrn, B
-    int dotclock=65146;
-    int hdisplay=1024;
- 
--// PCF
--#ifdef TWDEBUG
--   xf86DrvMsg(0,X_INFO,"SISHotkeySwitchMode\n");
--#endif
--
--
-    if(!VidModeGetCurrentModeline(pScrn->scrnIndex,&hkeymode,&dotClock))
-    return FALSE;
-           
-diff -p -up xf86-video-sis-0.9.1/src/sis_driver.h.orig xf86-video-sis-0.9.1/src/sis_driver.h
---- xf86-video-sis-0.9.1/src/sis_driver.h.orig	2008-09-02 10:19:02.000000000 -0400
-+++ xf86-video-sis-0.9.1/src/sis_driver.h	2010-01-27 15:21:54.000000000 -0500
-@@ -779,6 +779,9 @@ static Bool SISSwitchMode(int scrnIndex,
- static void SISNewAdjustFrame(int scrnIndex, int x, int y, int flags);
- static Bool SISPMEvent(int scrnIndex, pmEvent event, Bool undo);/*APM-ACPI, adding by Ivans.*/
- 
-+#if XSERVER_LIBPCIACCESS
-+static Bool SIS_pci_probe(DriverPtr driver, int entity_num, struct pci_device *device, intptr_t match_data);
-+#endif
- /* ACPI Device Switch functions */
- static Bool SISHotkeySwitchCRT1Status(ScrnInfoPtr pScrn,int onoff);/*hotkey pressing: switch CRT1 on/off*/
- static Bool SISHotkeySwitchCRT2Status(ScrnInfoPtr pScrn,ULong newvbflags ,ULong newvbflags3);/*LCD on/off*/
diff --git a/testing/xf86-video-sisimedia/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch b/testing/xf86-video-sisimedia/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch
deleted file mode 100644
index 415985921..000000000
--- a/testing/xf86-video-sisimedia/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- xf86-video-sis-0.9.1/src/sis_driver.c.orig	2010-01-18 13:17:56.000000000 -0500
-+++ xf86-video-sis-0.9.1/src/sis_driver.c	2010-01-25 16:35:40.000000000 -0500
-@@ -11677,7 +11677,64 @@ SISPMEvent(int scrnIndex, pmEvent event,
-   return 1;/*TRUE*/
- }
- 
-+void
-+sis_print_registers(SISPtr pSiS)
-+{
-+#define print(...)	xf86ErrorFVerb(1, __VA_ARGS__)
-+    auto void print_range(char *name, int base, int first, int last) {
-+	int		i, j;
-+	unsigned char	c;
-+	char		buffer[9];
-+	print("%s:\n", name);
-+	buffer[8] = 0;
-+	for (i = first; i <= last; i++) {
-+	    inSISIDXREG(base, i, c);
-+	    for (j = 0; j < 8; j++)
-+		buffer[7 - j] = c & (1 << j) ? '1' : '0';
-+	    print("\t%02x: %02x:%s\n", i, c, buffer);
-+	}
-+    }
- 
-+    auto void print_range_int(char *name, int base, int first, int last) {
-+	int		i, j;
-+	unsigned int	l;
-+	char		buffer[33];
-+	print("%s:\n", name);
-+	buffer[32] = 0;
-+	for (i = first; i <= last; i += 4) {
-+	    l = inSISREGL(base + i);
-+	    for (j = 0; j < 32; j++)
-+		buffer[31 - j] = l & (1 << j) ? '1' : '0';
-+	    print("\t%02x: %08x:%s\n", i, l, buffer);
-+	}
-+    }
- 
--
--
-+    print_range_int	("PCI: CNF00 - CNF1B", pSiS->RelIO, 0x00, 0x1b);
-+    print_range_int	("PCI: CNF2C - CNF47", pSiS->RelIO, 0x2C, 0x47);
-+    print_range_int	("AGP: CNF50 - CNF5B", pSiS->RelIO, 0x50, 0x5B);
-+    print_range		("CRT1: SR05 - SR12", SISSR, 0x05, 0x12);
-+    print_range		("CRT1: SR13 - SR16 (reserved)", SISSR, 0x13, 0x16);
-+    print		("CRT1: SR19 - SR1A (reserved)\n");
-+    print_range		("CRT1: SR1B - SR3A", SISSR, 0x1b, 0x3a);
-+    print		("CRT1: SR3B (reserved)\n");
-+    print_range		("CRT1: SR3C - SR3F", SISSR, 0x3c, 0x3f);
-+    print_range		("CRT1: CR19 - CR1A", SISCR, 0x19, 0x1a);
-+    print		("CRT1: CR1B - CR27 (undocumented?)\n");
-+    print_range		("CRT1: CR28 - CR2E", SISCR, 0x28, 0x2e);
-+    print		("CRT1: CR2F (reserved)\n");
-+    print_range		("VGA BIOS: CR30 - CR3F", SISCR, 0x30, 0x3f);
-+    print_range		("CRT1: CR40 - CR43", SISCR, 0x40, 0x43);
-+    print		("CRT1: CR44 - CR45 (reserved)\n");
-+    print_range		("CRT1: CR46 - CR67", SISCR, 0x46, 0x67);
-+    print		("CRT1: CR68 - CR6F (DRAM registers reserved for backward compatibility with 760)\n");
-+    print		("CRT1: CR70 - CR77 (undocumented?)\n");
-+    print_range		("SMA BIOS: CR78 - CR7F", SISCR, 0x78, 0x7f);
-+    print_range_int	("CRT1: CR80 - CR9B", SISCR, 0x80, 0xb3);
-+    print_range_int	("CRT1: CRC0 - CRF3", SISCR, 0xc0, 0xf3);
-+    print_range		("CRT2: SIGNAL REGISTERS, PART1 00 - 45", SISPART1, 0x00, 0x45);
-+    print_range		("CRT2: TV SIGNAL REGISTERS, PART2 00 - 4d", SISPART2, 0x00, 0x4d);
-+    print_range		("CRT2: TV COPY PROTECTION, PART3 00 - 40", SISPART3, 0x00, 0x40);
-+    print_range		("CRT2: SIGNAL REGISTERS, PART4 00 - 3A", SISPART4, 0x00, 0x3a);
-+    print_range		("CRT2: PALETTE SIGNAL REGISTERS, PART5 00 - 00 (?)", SISPART5, 0x00, 0x00);
-+#undef print
-+}
---- xf86-video-sis-0.9.1/src/sis_video.c.orig	2010-01-18 13:17:56.000000000 -0500
-+++ xf86-video-sis-0.9.1/src/sis_video.c	2010-01-26 13:38:13.000000000 -0500
-@@ -129,6 +129,8 @@
- 
- #include "sis_video.h"
- 
-+extern void sis_print_registers(SISPtr pSiS);
-+
- void SiSInitMC(ScreenPtr pScreen);
- 
- /*********************************
-@@ -712,6 +714,8 @@ SISResetVideo(ScrnInfoPtr pScrn)
- #ifdef SISMERGED
-     pPriv->mustresettap2 = TRUE;
- #endif
-+
-+    sis_print_registers(pSiS);
- }
- 
- 
diff --git a/testing/xf86-video-sisimedia/xserver19.patch b/testing/xf86-video-sisimedia/xserver19.patch
deleted file mode 100644
index 67ef6f585..000000000
--- a/testing/xf86-video-sisimedia/xserver19.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: xf86-video-sis-0.9.1/src/sis_driver.c
-===================================================================
---- xf86-video-sis-0.9.1.orig/src/sis_driver.c
-+++ xf86-video-sis-0.9.1/src/sis_driver.c
-@@ -85,7 +85,6 @@
- #include "shadowfb.h"
- #include "fb.h"
- #include "micmap.h"
--#include "mibank.h"
- #include "mipointer.h"
- #include "mibstore.h"
- #include "edid.h"
-Index: xf86-video-sis-0.9.1/src/sis_mergedfb.c
-===================================================================
---- xf86-video-sis-0.9.1.orig/src/sis_mergedfb.c
-+++ xf86-video-sis-0.9.1/src/sis_mergedfb.c
-@@ -2948,11 +2948,11 @@ SiSXineramaExtensionInit(ScrnInfoPtr pSc
- 
-        while(SiSXineramaGeneration != serverGeneration) {
- 
--	  ClientType = CreateNewResourceType(SiSXineramaFreeClient);
-+	  ClientType = CreateNewResourceType(SiSXineramaFreeClient, "XineramaClient");
- 	  if(!ClientType)
- 	     break;
- 
--	  EventType = CreateNewResourceType(SiSXineramaFreeEvents);
-+	  EventType = CreateNewResourceType(SiSXineramaFreeEvents, "XineramaEvents");
- 	  if(!EventType)
- 	     break;
- 
diff --git a/testing/xf86-video-sisusb/PKGBUILD b/testing/xf86-video-sisusb/PKGBUILD
deleted file mode 100644
index c4248402d..000000000
--- a/testing/xf86-video-sisusb/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 136501 2011-08-30 08:44:54Z jgc $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-sisusb
-pkgver=0.9.4
-pkgrel=5
-pkgdesc="X.org SiS USB video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('600fd49dffe00121f9042555fea55948653d1a7e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-tdfx/PKGBUILD b/testing/xf86-video-tdfx/PKGBUILD
deleted file mode 100644
index 87f315e4a..000000000
--- a/testing/xf86-video-tdfx/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 136499 2011-08-30 08:44:52Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-tdfx
-pkgver=1.4.3
-pkgrel=7
-pkgdesc="X.org tdfx video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc' 'tdfx-dri')
-makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
-conflicts=('xorg-server<1.10.99.902')
-options=(!libtool)
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        copyright.patch)
-md5sums=('8161bbf2b100c21b609163f0010766b3'
-         'a3be7ac534ceb846d3f155ddbe14378f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/copyright.patch"
-  ./configure --prefix=/usr --enable-dri
-  make
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-trident/PKGBUILD b/testing/xf86-video-trident/PKGBUILD
deleted file mode 100644
index cc2faf4a9..000000000
--- a/testing/xf86-video-trident/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 136497 2011-08-30 08:44:51Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-trident
-pkgver=1.3.4
-pkgrel=5
-pkgdesc="X.org Trident video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902' 'xf86dgaproto')
-conflicts=('xorg-server<1.10.99.902')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('7c40f5c02bddf399862782b708941e79302318af')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-tseng/PKGBUILD b/testing/xf86-video-tseng/PKGBUILD
deleted file mode 100644
index ab3606545..000000000
--- a/testing/xf86-video-tseng/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 136495 2011-08-30 08:44:49Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-tseng
-pkgver=1.2.4
-pkgrel=5
-pkgdesc="X.org tseng video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        fix-regression-from-pciaccess-conversion.patch)
-sha1sums=('1b45f55657b2c92f30abb0769cae57fca98d93b7'
-          'df7660ec18cce3e9f04a7c70f72c75daa947e4a9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-regression-from-pciaccess-conversion.patch"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-unichrome/LICENSE b/testing/xf86-video-unichrome/LICENSE
deleted file mode 100644
index f4007667b..000000000
--- a/testing/xf86-video-unichrome/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2004-2007 Luc Verhaegen. All Rights Reserved.
-Copyright (c) 2004-2005 The Unichrome Project. All Rights Reserved.
-Copyright (c) 1998-2003 VIA Technologies, Inc. All Rights Reserved.
-Copyright (c) 2001-2003 S3 Graphics, Inc. All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sub license,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/testing/xf86-video-unichrome/PKGBUILD b/testing/xf86-video-unichrome/PKGBUILD
deleted file mode 100644
index f596b71ec..000000000
--- a/testing/xf86-video-unichrome/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 136493 2011-08-30 08:44:47Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-unichrome
-pkgver=0.2.7
-pkgrel=6
-_gitversion=b917bee87db8a65b8e8da0ca12c24a176c9e9fb2
-pkgdesc="Unichrome video drivers for X.Org"
-arch=(i686 x86_64)
-url="http://unichrome.sf.net/"
-license=('custom')
-depends=('glibc' 'unichrome-dri')
-makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc' 'glproto')
-options=('!libtool')
-conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.10.99.902')
-source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2)
-md5sums=('f7adef052de08a01af86e245d1932239')
-
-build() {
-  cd "${srcdir}/${pkgname}-${_gitversion}"
-  ./autogen.sh --prefix=/usr --enable-dri
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
diff --git a/testing/xf86-video-v4l/LICENSE b/testing/xf86-video-v4l/LICENSE
deleted file mode 100644
index 535595b88..000000000
--- a/testing/xf86-video-v4l/LICENSE
+++ /dev/null
@@ -1,826 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-                                  Licenses
-
-                            The X.Org Foundation
-
-                                 March 2004
-
-1.  Introduction
-
-The X.org Foundation X Window System distribution is a compilation of code
-and documentation from many sources.  This document is intended primarily as
-a guide to the licenses used in the distribution: you must check each file
-and/or package for precise redistribution terms. None-the-less, this summary
-may be useful to many users.  No software incorporating the XFree86 1.1
-license has been incorporated.
-
-This document is based on the compilation from XFree86.
-
-2.  XFree86 License
-
-XFree86 code without an explicit copyright is covered by the following copy-
-right/license:
-
-Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the XFree86
-Project.
-
-3.  Other Licenses
-
-Portions of code are covered by the following licenses/copyrights.  See indi-
-vidual files for the copyright dates.
-
-3.1  X/MIT Copyrights
-
-3.1.1  X Consortium
-
-Copyright (C) <date> X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE X
-CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-X Window System is a trademark of X Consortium, Inc.
-
-3.1.2  The Open Group
-
-Copyright <date>  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-3.2  Berkeley-based copyrights:
-
-o
-
-3.2.1  General
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.  Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.  The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.2  UCB/LBL
-
-Copyright (c) 1993 The Regents of the University of California.  All rights
-reserved.
-
-This software was developed by the Computer Systems Engineering group at
-Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and contributed to
-Berkeley.
-
-All advertising materials mentioning features or use of this software must
-display the following acknowledgement: This product includes software devel-
-oped by the University of California, Lawrence Berkeley Laboratory.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.  Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.  All advertising materials mentioning features or use of this software
-      must display the following acknowledgement: This product includes soft-
-      ware developed by the University of California, Berkeley and its con-
-      tributors.
-
-  4.  Neither the name of the University nor the names of its contributors
-      may be used to endorse or promote products derived from this software
-      without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DIS-
-CLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.3  The NetBSD Foundation, Inc.
-
-Copyright (c) 2003 The NetBSD Foundation, Inc.  All rights reserved.
-
-This code is derived from software contributed to The NetBSD Foundation by
-Ben Collver <collver1@attbi.com>
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.   Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.   Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.   All advertising materials mentioning features or use of this software
-      must display the following acknowledgement: This product includes soft-
-      ware developed by the NetBSD Foundation, Inc. and its contributors.
-
-  4.   Neither the name of The NetBSD Foundation nor the names of its con-
-      tributors may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSE-
-QUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAM-
-AGE.
-
-3.2.4  Theodore Ts'o.
-
-Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999.  All rights
-reserved.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.  Redistributions of source code must retain the above copyright notice,
-      and the entire permission notice in its entirety, including the dis-
-      claimer of warranties.
-
-  2.  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.  he name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED.  IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF NOT
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.5  Theo de Raadt and Damien Miller
-
-Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.  Copyright (c)
-2001-2002 Damien Miller.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.   Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.   Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.6  Todd C. Miller
-
-Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-
-Permission to use, copy, modify, and distribute this software for any purpose
-with or without fee is hereby granted, provided that the above copyright
-notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CON-
-TRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-3.2.7  Thomas Winischhofer
-
-Copyright (C) 2001-2004 Thomas Winischhofer
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.   Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.   Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.   The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.3  NVIDIA Corp
-
-Copyright (c) 1996 NVIDIA, Corp.  All rights reserved.
-
-NOTICE TO USER: The source code is copyrighted under U.S. and international
-laws.  NVIDIA, Corp. of Sunnyvale, California owns the copyright and as
-design patents pending on the design and interface of the NV chips.  Users
-and possessors of this source code are hereby granted a nonexclusive, roy-
-alty-free copyright and design patent license to use this code in individual
-and commercial software.
-
-Any use of this source code must include, in the user documentation and
-internal comments to the code, notices to the end user as follows:
-
-Copyright (c) 1996 NVIDIA, Corp.  NVIDIA design patents pending in the U.S.
-and foreign countries.
-
-NVIDIA, CORP.  MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE
-CODE FOR ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WAR-
-RANTY OF ANY KIND.  NVIDIA, CORP. DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL NVIDIA, CORP.  BE LIABLE
-FOR ANY SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAM-
-AGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE.
-
-3.4  GLX Public License
-
-GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License")
-
-Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby
-grants permission to Recipient (defined below), under Recipient's copyrights
-in the Original Software (defined below), to use, copy, modify, merge, pub-
-lish, distribute, sublicense and/or sell copies of Subject Software (defined
-below), and to permit persons to whom the Subject Software is furnished in
-accordance with this License to do the same, subject to all of the following
-terms and conditions, which Recipient accepts by engaging in any such use,
-copying, modifying, merging, publishing, distributing, sublicensing or sell-
-ing:
-
-1. Definitions.
-
-     (a) "Original Software" means source code of computer software code
-     which is described in Exhibit A as Original Software.
-
-     (b) "Modifications" means any addition to or deletion from the sub-
-     stance or structure of either the Original Software or any previous
-     Modifications. When Subject Software is released as a series of
-     files, a Modification means (i) any addition to or deletion from
-     the contents of a file containing Original Software or previous
-     Modifications and (ii) any new file that contains any part of the
-     Original Code or previous Modifications.
-
-     (c) "Subject Software" means the Original Software or Modifications
-     or the combination of the Original Software and Modifications, or
-     portions of any of the foregoing.
-
-     (d) "Recipient" means an individual or a legal entity exercising
-     rights under, and complying with all of the terms of, this License.
-     For legal entities, "Recipient" includes any entity which controls,
-     is controlled by, or is under common control with Recipient. For
-     purposes of this definition, "control" of an entity means (a) the
-     power, direct or indirect, to direct or manage such entity, or (b)
-     ownership of fifty percent (50%) or more of the outstanding shares
-     or beneficial ownership of such entity.
-
-2. Redistribution of Source Code Subject to These Terms. Redistributions of
-Subject Software in source code form must retain the notice set forth in
-Exhibit A, below, in every file. A copy of this License must be included in
-any documentation for such Subject Software where the recipients' rights
-relating to Subject Software are described. Recipient may distribute the
-source code version of Subject Software under a license of Recipient's
-choice, which may contain terms different from this License, provided that
-(i) Recipient is in compliance with the terms of this License, and (ii) the
-license terms include this Section 2 and Sections 3, 4, 7, 8, 10, 12 and 13
-of this License, which terms may not be modified or superseded by any other
-terms of such license. If Recipient distributes the source code version under
-a different license Recipient must make it absolutely clear that any terms
-which differ from this License are offered by Recipient alone, not by SGI.
-Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as
-a result of any such terms Recipient offers.
-
-3. Redistribution in Executable Form. The notice set forth in Exhibit A must
-be conspicuously included in any notice in an executable version of Subject
-Software, related documentation or collateral in which Recipient describes
-the user's rights relating to the Subject Software. Recipient may distribute
-the executable version of Subject Software under a license of Recipient's
-choice, which may contain terms different from this License, provided that
-(i) Recipient is in compliance with the terms of this License, and (ii) the
-license terms include this Section 3 and Sections 4, 7, 8, 10, 12 and 13 of
-this License, which terms may not be modified or superseded by any other
-terms of such license. If Recipient distributes the executable version under
-a different license Recipient must make it absolutely clear that any terms
-which differ from this License are offered by Recipient alone, not by SGI.
-Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as
-a result of any such terms Recipient offers.
-
-4. Termination. This License and the rights granted hereunder will terminate
-automatically if Recipient fails to comply with terms herein and fails to
-cure such breach within 30 days of the breach. Any sublicense to the Subject
-Software which is properly granted shall survive any termination of this
-License absent termination by the terms of such sublicense. Provisions which,
-by their nature, must remain in effect beyond the termination of this License
-shall survive.
-
-5. No Trademark Rights. This License does not grant any rights to use any
-trade name, trademark or service mark whatsoever. No trade name, trademark or
-service mark of SGI may be used to endorse or promote products derived from
-the Subject Software without prior written permission of SGI.
-
-6. No Other Rights. This License does not grant any rights with respect to
-the OpenGL API or to any software or hardware implementation thereof or to
-any other software whatsoever, nor shall any other rights or licenses not
-expressly granted hereunder arise by implication, estoppel or otherwise with
-respect to the Subject Software. Title to and ownership of the Original Soft-
-ware at all times remains with SGI. All rights in the Original Software not
-expressly granted under this License are reserved.
-
-7. Compliance with Laws; Non-Infringement. Recipient shall comply with all
-applicable laws and regulations in connection with use and distribution of
-the Subject Software, including but not limited to, all export and import
-control laws and regulations of the U.S. government and other countries.
-Recipient may not distribute Subject Software that (i) in any way infringes
-(directly or contributorily) the rights (including patent, copyright, trade
-secret, trademark or other intellectual property rights of any kind) of any
-other person or entity or (ii) breaches any representation or warranty,
-express, implied or statutory, which under any applicable law it might be
-deemed to have been distributed.
-
-8. Claims of Infringement. If Recipient at any time has knowledge of any one
-or more third party claims that reproduction, modification, use, distribu-
-tion, import or sale of Subject Software (including particular functionality
-or code incorporated in Subject Software) infringes the third party's intel-
-lectual property rights, Recipient must place in a well-identified web page
-bearing the title "LEGAL" a description of each such claim and a description
-of the party making each such claim in sufficient detail that a user of the
-Subject Software will know whom to contact regarding the claim. Also, upon
-gaining such knowledge of any such claim, Recipient must conspicuously
-include the URL for such web page in the Exhibit A notice required under Sec-
-tions 2 and 3, above, and in the text of any related documentation, license
-agreement or collateral in which Recipient describes end user's rights relat-
-ing to the Subject Software. If Recipient obtains such knowledge after it
-makes Subject Software available to any other person or entity, Recipient
-shall take other steps (such as notifying appropriate mailing lists or news-
-groups) reasonably calculated to inform those who received the Subject Soft-
-ware that new knowledge has been obtained.
-
-9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER-
-CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON- INFRINGING. SGI ASSUMES NO
-RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE
-PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER-
-VICING, REPAIR OR CORRECTION.  THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED
-HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THE-
-ORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIA-
-BILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
-STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
-THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
-TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO
-THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES,
-SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT.
-
-11. Indemnity. Recipient shall be solely responsible for damages arising,
-directly or indirectly, out of its utilization of rights under this License.
-Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc.
-from and against any loss, liability, damages, costs or expenses (including
-the payment of reasonable attorneys fees) arising out of Recipient's use,
-modification, reproduction and distribution of the Subject Software or out of
-any representation or warranty made by Recipient.
-
-12. U.S. Government End Users. The Subject Software is a "commercial item"
-consisting of "commercial computer software" as such terms are defined in
-title 48 of the Code of Federal Regulations and all U.S.  Government End
-Users acquire only the rights set forth in this License and are subject to
-the terms of this License.
-
-13. Miscellaneous. This License represents the complete agreement concerning
-subject matter hereof. If any provision of this License is held to be unen-
-forceable, such provision shall be reformed so as to achieve as nearly as
-possible the same economic effect as the original provision and the remainder
-of this License will remain in effect. This License shall be governed by and
-construed in accordance with the laws of the United States and the State of
-California as applied to agreements entered into and to be performed entirely
-within California between California residents. Any litigation relating to
-this License shall be subject to the exclusive jurisdiction of the Federal
-Courts of the Northern District of California (or, absent subject matter
-jurisdiction in such courts, the courts of the State of California), with
-venue lying exclusively in Santa Clara County, California, with the losing
-party responsible for costs, including without limitation, court costs and
-reasonable attorneys fees and expenses. The application of the United Nations
-Convention on Contracts for the International Sale of Goods is expressly
-excluded. Any law or regulation which provides that the language of a con-
-tract shall be construed against the drafter shall not apply to this License.
-
-Exhibit A
-
-The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12 and
-13 of the GLX Public License Version 1.0 (the "License"). You may not use
-this file except in compliance with those sections of the License. You may
-obtain a copy of the License at Silicon Graphics, Inc., attn: Legal Services,
-2011 N. Shoreline Blvd., Mountain View, CA 94043 or at
-http://www.sgi.com/software/opensource/glx/license.html.
-
-Software distributed under the License is distributed on an "AS IS" basis.
-ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED
-WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON-
-INFRINGEMENT. See the License for the specific language governing rights and
-limitations under the License.
-
-The Original Software is GLX version 1.2 source code, released February,
-1999. The developer of the Original Software is Silicon Graphics, Inc.  Those
-portions of the Subject Software created by Silicon Graphics, Inc.  are Copy-
-right (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-
-3.5  CID Font Code Public License
-
-CID FONT CODE PUBLIC LICENSE (Version 1.0 (3/31/99))("License")
-
-Subject to any applicable third party claims, Silicon Graphics, Inc. ("SGI")
-hereby grants permission to Recipient (defined below), under SGI's copyrights
-in the Original Software (defined below), to use, copy, modify, merge, pub-
-lish, distribute, sublicense and/or sell copies of Subject Software (defined
-below) in both source code and executable form, and to permit persons to whom
-the Subject Software is furnished in accordance with this License to do the
-same, subject to all of the following terms and conditions, which Recipient
-accepts by engaging in any such use, copying, modifying, merging, publica-
-tion, distributing, sublicensing or selling:
-
-1. Definitions.
-
-     a. "Original Software" means source code of computer software code
-     that is described in Exhibit A as Original Software.
-
-     b. "Modifications" means any addition to or deletion from the sub-
-     stance or structure of either the Original Software or any previous
-     Modifications. When Subject Software is released as a series of
-     files, a Modification means (i) any addition to or deletion from
-     the contents of a file containing Original Software or previous
-     Modifications and (ii) any new file that contains any part of the
-     Original Code or previous Modifications.
-
-     c. "Subject Software" means the Original Software or Modifications
-     or the combination of the Original Software and Modifications, or
-     portions of any of the foregoing.
-
-     d. "Recipient" means an individual or a legal entity exercising
-     rights under the terms of this License. For legal entities, "Recip-
-     ient" includes any entity that controls, is controlled by, or is
-     under common control with Recipient. For purposes of this defini-
-     tion, "control" of an entity means (i) the power, direct or indi-
-     rect, to direct or manage such entity, or (ii) ownership of fifty
-     percent (50%) or more of the outstanding shares or beneficial own-
-     ership of such entity.
-
-     e. "Required Notice" means the notice set forth in Exhibit A to
-     this License.
-
-     f. "Accompanying Technology" means any software or other technology
-     that is not a Modification and that is distributed or made publicly
-     available by Recipient with the Subject Software.  Separate soft-
-     ware files that do not contain any Original Software or any previ-
-     ous Modification shall not be deemed a Modification, even if such
-     software files are aggregated as part of a product, or in any
-     medium of storage, with any file that does contain Original Soft-
-     ware or any previous Modification.
-
-2. License Terms. All distribution of the Subject Software must be made sub-
-ject to the terms of this License. A copy of this License and the Required
-Notice must be included in any documentation for Subject Software where
-Recipient's rights relating to Subject Software and/or any Accompanying Tech-
-nology are described. Distributions of Subject Software in source code form
-must also include the Required Notice in every file distributed. In addition,
-a ReadMe file entitled "Important Legal Notice" must be distributed with each
-distribution of one or more files that incorporate Subject Software. That
-file must be included with distributions made in both source code and exe-
-cutable form. A copy of the License and the Required Notice must be included
-in that file.  Recipient may distribute Accompanying Technology under a
-license of Recipient's choice, which may contain terms different from this
-License, provided that (i) Recipient is in compliance with the terms of this
-License, (ii) such other license terms do not modify or supersede the terms
-of this License as applicable to the Subject Software, (iii) Recipient hereby
-indemnifies SGI for any liability incurred by SGI as a result of the distri-
-bution of Accompanying Technology or the use of other license terms.
-
-3. Termination. This License and the rights granted hereunder will terminate
-automatically if Recipient fails to comply with terms herein and fails to
-cure such breach within 30 days of the breach. Any sublicense to the Subject
-Software that is properly granted shall survive any termination of this
-License absent termination by the terms of such sublicense. Provisions which,
-by their nature, must remain in effect beyond the termination of this License
-shall survive.
-
-4. Trademark Rights. This License does not grant any rights to use any trade
-name, trademark or service mark whatsoever. No trade name, trademark or ser-
-vice mark of SGI may be used to endorse or promote products derived from or
-incorporating any Subject Software without prior written permission of SGI.
-
-5. No Other Rights. No rights or licenses not expressly granted hereunder
-shall arise by implication, estoppel or otherwise. Title to and ownership of
-the Original Software at all times remains with SGI. All rights in the Origi-
-nal Software not expressly granted under this License are reserved.
-
-6. Compliance with Laws; Non-Infringement. Recipient shall comply with all
-applicable laws and regulations in connection with use and distribution of
-the Subject Software, including but not limited to, all export and import
-control laws and regulations of the U.S. government and other countries.
-Recipient may not distribute Subject Software that (i) in any way infringes
-(directly or contributorily) the rights (including patent, copyright, trade
-secret, trademark or other intellectual property rights of any kind) of any
-other person or entity, or (ii) breaches any representation or warranty,
-express, implied or statutory, which under any applicable law it might be
-deemed to have been distributed.
-
-7. Claims of Infringement. If Recipient at any time has knowledge of any one
-or more third party claims that reproduction, modification, use, distribu-
-tion, import or sale of Subject Software (including particular functionality
-or code incorporated in Subject Software) infringes the third party's intel-
-lectual property rights, Recipient must place in a well-identified web page
-bearing the title "LEGAL" a description of each such claim and a description
-of the party making each such claim in sufficient detail that a user of the
-Subject Software will know whom to contact regarding the claim. Also, upon
-gaining such knowledge of any such claim, Recipient must conspicuously
-include the URL for such web page in the Required Notice, and in the text of
-any related documentation, license agreement or collateral in which Recipient
-describes end user's rights relating to the Subject Software. If Recipient
-obtains such knowledge after it makes Subject Software available to any other
-person or entity, Recipient shall take other steps (such as notifying appro-
-priate mailing lists or newsgroups) reasonably calculated to provide such
-knowledge to those who received the Subject Software.
-
-8. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER-
-CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. SGI ASSUMES NO
-RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE
-PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER-
-VICING, REPAIR OR CORRECTION.  THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED
-HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
-WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY),
-CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SUBJECT SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SUBJECT SOFTWARE. SOME JURISDICTIONS DO NOT
-ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO THIS EXCLUSION AND
-LIMITATION MAY NOT APPLY TO RECIPIENT TO THE EXTENT SO DISALLOWED.
-
-10. Indemnity. Recipient shall be solely responsible for damages arising,
-directly or indirectly, out of its utilization of rights under this License.
-Recipient will defend, indemnify and hold SGI and its successors and assigns
-harmless from and against any loss, liability, damages, costs or expenses
-(including the payment of reasonable attorneys fees) arising out of (Recipi-
-ent's use, modification, reproduction and distribution of the Subject Soft-
-ware or out of any representation or warranty made by Recipient.
-
-11. U.S. Government End Users. The Subject Software is a "commercial item"
-consisting of "commercial computer software" as such terms are defined in
-title 48 of the Code of Federal Regulations and all U.S. Government End Users
-acquire only the rights set forth in this License and are subject to the
-terms of this License.
-
-12. Miscellaneous. This License represents the complete agreement concerning
-subject matter hereof. If any provision of this License is held to be unen-
-forceable by any judicial or administrative authority having proper jurisdic-
-tion with respect thereto, such provision shall be reformed so as to achieve
-as nearly as possible the same economic effect as the original provision and
-the remainder of this License will remain in effect. This License shall be
-governed by and construed in accordance with the laws of the United States
-and the State of California as applied to agreements entered into and to be
-performed entirely within California between California residents. Any liti-
-gation relating to this License shall be subject to the exclusive jurisdic-
-tion of the Federal Courts of the Northern District of California (or, absent
-subject matter jurisdiction in such courts, the courts of the State of Cali-
-fornia), with venue lying exclusively in Santa Clara County, California, with
-the losing party responsible for costs, including without limitation, court
-costs and reasonable attorneys fees and expenses. The application of the
-United Nations Convention on Contracts for the International Sale of Goods is
-expressly excluded. Any law or regulation that provides that the language of
-a contract shall be construed against the drafter shall not apply to this
-License.
-
-Exhibit A
-
-Copyright (c) 1994-1999 Silicon Graphics, Inc.
-
-The contents of this file are subject to the CID Font Code Public License
-Version 1.0 (the "License"). You may not use this file except in compliance
-with the License. You may obtain a copy of the License at Silicon Graphics,
-Inc., attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-or at http://www.sgi.com/software/opensource/cid/license.html
-
-Software distributed under the License is distributed on an "AS IS" basis.
-ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED
-WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON-
-INFRINGEMENT. See the License for the specific language governing rights and
-limitations under the License.
-
-The Original Software (as defined in the License) is CID font code that was
-developed by Silicon Graphics, Inc. Those portions of the Subject Software
-(as defined in the License) that were created by Silicon Graphics, Inc. are
-Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved.
-
-[NOTE: When using this text in connection with Subject Software delivered
-solely in object code form, Recipient may replace the words "this file" with
-"this software" in both the first and second sentences.]
-
-3.6  Bitstream Vera Fonts Copyright
-
-The fonts have a generous copyright, allowing derivative works (as long as
-"Bitstream" or "Vera" are not in the names), and full redistribution (so long
-as they are not *sold* by themselves). They can be be bundled, redistributed
-and sold with any software.
-
-The fonts are distributed under the following copyright:
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated documentation
-files (the "Font Software"), to reproduce and distribute the Font Software,
-including without limitation the rights to use, copy, merge, publish, dis-
-tribute, and/or sell copies of the Font Software, and to permit persons to
-whom the Font Software is furnished to do so, subject to the following condi-
-tions:
-
-The above copyright and trademark notices and this permission notice shall be
-included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and addi-
-tional glyphs or characters may be added to the Fonts, only if the fonts are
-renamed to names not containing either the words "Bitstream" or the word
-"Vera".
-
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream Vera"
-names.
-
-The Font Software may be sold as part of a larger software package but no
-copy of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDA-
-TION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN-
-ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
-INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT-
-WARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome Foundation,
-and Bitstream Inc., shall not be used in advertising or otherwise to promote
-the sale, use or other dealings in this Font Software without prior written
-authorization from the Gnome Foundation or Bitstream Inc., respectively. For
-further information, contact: fonts at gnome dot org.
-
-3.7  Bigelow & Holmes Inc and URW++ GmbH Luxi font license
-
-Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font instruction
-code copyright (c) 2001 by URW++ GmbH. All Rights Reserved. Luxi is a regis-
-tered trademark of Bigelow & Holmes Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of these Fonts and associated documentation files (the "Font Software"), to
-deal in the Font Software, including without limitation the rights to use,
-copy, merge, publish, distribute, sublicense, and/or sell copies of the Font
-Software, and to permit persons to whom the Font Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright and trademark notices and this permission notice shall be
-included in all copies of one or more of the Font Software.
-
-The Font Software may not be modified, altered, or added to, and in particu-
-lar the designs of glyphs or characters in the Fonts may not be modified nor
-may additional glyphs or characters be added to the Fonts. This License
-becomes null and void when the Fonts or Font Software have been modified.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT.  IN NO EVENT SHALL BIGELOW & HOLMES INC. OR URW++
-GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN-
-ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
-INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT-
-WARE.
-
-Except as contained in this notice, the names of Bigelow & Holmes Inc. and
-URW++ GmbH. shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Font Software without prior written
-authorization from Bigelow & Holmes Inc. and URW++ GmbH.
-
-For further information, contact:
-
-info@urwpp.de or design@bigelowandholmes.com
-
-     $Id: LICENSE,v 1.3 2004/09/03 23:41:21 kem Exp $
diff --git a/testing/xf86-video-v4l/PKGBUILD b/testing/xf86-video-v4l/PKGBUILD
deleted file mode 100644
index 047d5ecb6..000000000
--- a/testing/xf86-video-v4l/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 136491 2011-08-30 08:44:45Z jgc $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-v4l
-pkgver=0.2.0
-pkgrel=9
-pkgdesc="X.org v4l video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel')
-conflicts=('xorg-server<1.10.0')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch
-        LICENSE)
-md5sums=('2251ae2a0a905764941cd7b098e85ad1'
-         'cdb7113a9564ea9202e847de88440540'
-         '7d4d018f6bbff7e42672d1aabc75c5cf')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  autoreconf -fi
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-vesa/PKGBUILD b/testing/xf86-video-vesa/PKGBUILD
deleted file mode 100644
index 003f73a11..000000000
--- a/testing/xf86-video-vesa/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 136489 2011-08-30 08:44:41Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-vesa
-pkgver=2.3.0
-pkgrel=6
-pkgdesc="X.org vesa video driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server-devel>=1.10.99.902')
-conflicts=('xorg-server<1.10.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
-sha1sums=('4689b7c295d7a8d7326302dafecb812739617134'
-          '1e54ae50daa796ab0c29c8088f25e522dc6faa4a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  autoreconf -fi
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-voodoo/PKGBUILD b/testing/xf86-video-voodoo/PKGBUILD
deleted file mode 100644
index 8c40ed230..000000000
--- a/testing/xf86-video-voodoo/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 136485 2011-08-30 08:44:36Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-voodoo
-pkgver=1.2.4
-pkgrel=5
-pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902' 'xf86dgaproto')
-conflicts=('xorg-server<1.10.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('7ecd232cc0b7fe507e18e08799791eefa9fdaf48')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/xf86-video-xgi/PKGBUILD b/testing/xf86-video-xgi/PKGBUILD
deleted file mode 100644
index 3c9af94dc..000000000
--- a/testing/xf86-video-xgi/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 136483 2011-08-30 08:44:35Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-xgi
-pkgver=1.6.0
-pkgrel=4
-pkgdesc="X.org XGI video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'xf86dgaproto')
-conflicts=('xorg-server<1.10.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch)
-sha1sums=('826f14d6ba799cd2aae9f0c818f84cf8b75f1ddb'
-          '61ce13325c69befaa710c3389a85a8aa9d1cf28d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-xgi/git-fixes.patch b/testing/xf86-video-xgi/git-fixes.patch
deleted file mode 100644
index f15fea88a..000000000
--- a/testing/xf86-video-xgi/git-fixes.patch
+++ /dev/null
@@ -1,451 +0,0 @@
-diff --git a/man/xgi.man b/man/xgi.man
-index 19880f2..5699ae4 100644
---- a/man/xgi.man
-+++ b/man/xgi.man
-@@ -1,4 +1,3 @@
--.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/xgi/xgi.man,v 1.14 2003/11/12 16:50:36 twini Exp $
- .\" shorthand for double quote that works everywhere.
- .ds q \N'34'
- .TH XGI __drivermansuffix__ __vendorversion__
-diff --git a/src/vb_init.c b/src/vb_init.c
-index 8338410..50980c4 100755
---- a/src/vb_init.c
-+++ b/src/vb_init.c
-@@ -131,6 +131,8 @@ static void XGINew_SetDRAMDefaultRegister340(PXGI_HW_DEVICE_INFO, USHORT,
- static void XGINew_SetDRAMDefaultRegisterXG45(PXGI_HW_DEVICE_INFO, USHORT, 
-     PVB_DEVICE_INFO);
- static UCHAR XGINew_Get340DRAMType(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO);
-+/* horrible */
-+#define XGINew_GetXG20DRAMType XGINew_Get340DRAMType
- 
- static int XGINew_SetDDRChannel(int index, UCHAR ChannelNo,
-     UCHAR XGINew_ChannelAB, const USHORT DRAMTYPE_TABLE[][5],
-@@ -1451,7 +1453,7 @@ void XGINew_SetDRAMDefaultRegister340( PXGI_HW_DEVICE_INFO HwDeviceExtension ,
-     }
- 
-     temp3 = 0 ;
--    for( k = 0 ; k < 4 ; k++ )
-+    for( k = 1 ; k < 4 ; k++ )
-     {
-         XGI_SetRegANDOR((XGIIOADDRESS) P3d4 , 0x6E , 0xFC , temp3 ) ;		/* CR6E_D[1:0] select channel */
-         temp2 = 0 ;
-diff --git a/src/vgatypes.h b/src/vgatypes.h
-index 8a60927..7484661 100755
---- a/src/vgatypes.h
-+++ b/src/vgatypes.h
-@@ -1,5 +1,3 @@
--/* $XFree86$ */
--/* $XdotOrg$ */
- /*
-  * General type definitions for universal mode switching modules
-  *
-diff --git a/src/xgi.h b/src/xgi.h
-index 715502f..e818631 100755
---- a/src/xgi.h
-+++ b/src/xgi.h
-@@ -981,6 +981,7 @@ int compute_vclk(int Clock, int *out_n, int *out_dn, int *out_div,
- void XGI_WaitBeginRetrace(XGIIOADDRESS RelIO);
- void XGI_WaitEndRetrace(XGIIOADDRESS RelIO);
- 
-+#include <unistd.h>
- /* 2005/11/21 added by jjtseng */
- #define DelayS(sec) usleep((sec)*1000000)
- #define DelayMS(millisec) usleep((millisec)*1000)
-diff --git a/src/xgi_accel.c b/src/xgi_accel.c
-index c072691..4c298ed 100755
---- a/src/xgi_accel.c
-+++ b/src/xgi_accel.c
-@@ -200,20 +200,7 @@ extern int FbDevExist;
- #endif
- 
- #if X_BYTE_ORDER == X_BIG_ENDIAN
--static CARD32 BE_SWAP32 (CARD32 val)
--{
--	PDEBUG(ErrorF("X_BIG_ENDIAN...\n"));
--    if (CurrentColorDepth == 8)
--	    return   ((((val) & 0x000000ff) << 24) | \
--                  (((val) & 0x0000ff00) << 8) |  \
--                  (((val) & 0x00ff0000) >> 8) |  \
--                  (((val) & 0xff000000) >> 24));
--    if (CurrentColorDepth == 24)
--        return val;
--    if (CurrentColorDepth == 16)
--        return ((((val) & 0x0000ffff) << 16) | \
--		         (((val) & 0xffff0000) >> 16));
--}    
-+#define BE_SWAP32(x) lswapl(x)
- #else 
- static CARD32 BE_SWAP32 (CARD32 val)
- {
-diff --git a/src/xgi_dga.c b/src/xgi_dga.c
-index 04f90aa..8bd84bc 100755
---- a/src/xgi_dga.c
-+++ b/src/xgi_dga.c
-@@ -103,18 +103,18 @@ XGISetupDGAMode(
- 
- 	if(pMode->HDisplay != otherPitch) {
- 
--	    newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (*num + 2) * sizeof(DGAModeRec));
- 	    oneMore  = TRUE;
- 
- 	} else {
- 
--	    newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec));
-+	    newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec));
- 	    oneMore  = FALSE;
- 
- 	}
- 
- 	if(!newmodes) {
--	    xfree(modes);
-+	    free(modes);
- 	    return NULL;
- 	}
- 	modes = newmodes;
-diff --git a/src/xgi_dri.c b/src/xgi_dri.c
-index 93687e1..e575c19 100755
---- a/src/xgi_dri.c
-+++ b/src/xgi_dri.c
-@@ -46,7 +46,6 @@
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86Priv.h"
- 
- #include "xf86PciInfo.h"
- #include "xf86Pci.h"
-@@ -145,13 +144,13 @@ XGIInitVisualConfigs(ScreenPtr pScreen)
-     }
-     if (!(pXGIConfigs = (XGIConfigPrivPtr)xnfcalloc(sizeof(XGIConfigPrivRec),
- 						    numConfigs))) {
--      xfree(pConfigs);
-+      free(pConfigs);
-       return FALSE;
-     }
-     if (!(pXGIConfigPtrs = (XGIConfigPrivPtr*)xnfcalloc(sizeof(XGIConfigPrivPtr),
- 							  numConfigs))) {
--      xfree(pConfigs);
--      xfree(pXGIConfigs);
-+      free(pConfigs);
-+      free(pXGIConfigs);
-       return FALSE;
-     }
-     for (i=0; i<numConfigs; i++)
-@@ -333,7 +332,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen)
-   pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
- 
-   if (!DRIScreenInit(pScreen, pDRIInfo, &pXGI->drmSubFD)) {
--    xfree(pDRIInfo->devPrivate);
-+    free(pDRIInfo->devPrivate);
-     pDRIInfo->devPrivate=0;
-     DRIDestroyInfoRec(pXGI->pDRIInfo);
-     pXGI->pDRIInfo=0;
-@@ -537,14 +536,14 @@ XGIDRICloseScreen(ScreenPtr pScreen)
- 
-   if (pXGI->pDRIInfo) {
-     if (pXGI->pDRIInfo->devPrivate) {
--      xfree(pXGI->pDRIInfo->devPrivate);
-+      free(pXGI->pDRIInfo->devPrivate);
-       pXGI->pDRIInfo->devPrivate=0;
-     }
-     DRIDestroyInfoRec(pXGI->pDRIInfo);
-     pXGI->pDRIInfo=0;
-   }
--  if (pXGI->pVisualConfigs) xfree(pXGI->pVisualConfigs);
--  if (pXGI->pVisualConfigsPriv) xfree(pXGI->pVisualConfigsPriv);
-+  if (pXGI->pVisualConfigs) free(pXGI->pVisualConfigs);
-+  if (pXGI->pVisualConfigsPriv) free(pXGI->pVisualConfigsPriv);
- 
-   if(pXGI->agpSize){
- /* ErrorF("Freeing agp memory\n"); */
-diff --git a/src/xgi_driver.c b/src/xgi_driver.c
-index b4f83b8..b8b8679 100755
---- a/src/xgi_driver.c
-+++ b/src/xgi_driver.c
-@@ -54,7 +54,7 @@
- #include "fb.h"
- #include "micmap.h"
- #include "xf86.h"
--#include "xf86Priv.h"
-+#include "xf86Module.h"
- #include "xf86_OSproc.h"
- #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
- #include "xf86Resources.h"
-@@ -106,6 +106,10 @@
- #include <unistd.h>
- #endif
- 
-+#ifndef DEFAULT_DPI
-+#define DEFAULT_DPI 96
-+#endif
-+
- /* Jong 01/22/2009; compiler error; type conflict */
- /*
- #include <fcntl.h>
-@@ -556,13 +560,13 @@ XGIFreeRec(ScrnInfoPtr pScrn)
-              * head.
-              */
-             if (pXGIEnt->BIOS)
--                xfree(pXGIEnt->BIOS);
-+                free(pXGIEnt->BIOS);
-             pXGIEnt->BIOS = pXGI->BIOS = NULL;
-             if (pXGIEnt->XGI_Pr)
--                xfree(pXGIEnt->XGI_Pr);
-+                free(pXGIEnt->XGI_Pr);
-             pXGIEnt->XGI_Pr = pXGI->XGI_Pr = NULL;
-             if (pXGIEnt->RenderAccelArray)
--                xfree(pXGIEnt->RenderAccelArray);
-+                free(pXGIEnt->RenderAccelArray);
-             pXGIEnt->RenderAccelArray = pXGI->RenderAccelArray = NULL;
-         }
-         else {
-@@ -573,19 +577,19 @@ XGIFreeRec(ScrnInfoPtr pScrn)
-     }
-     else {
-         if (pXGI->BIOS)
--            xfree(pXGI->BIOS);
-+            free(pXGI->BIOS);
-         pXGI->BIOS = NULL;
-         if (pXGI->XGI_Pr)
--            xfree(pXGI->XGI_Pr);
-+            free(pXGI->XGI_Pr);
-         pXGI->XGI_Pr = NULL;
-         if (pXGI->RenderAccelArray)
--            xfree(pXGI->RenderAccelArray);
-+            free(pXGI->RenderAccelArray);
-         pXGI->RenderAccelArray = NULL;
-     }
- 
- #ifdef XGIMERGED
-     if (pXGI->MetaModes)
--        xfree(pXGI->MetaModes);
-+        free(pXGI->MetaModes);
-     pXGI->MetaModes = NULL;
- 
-     if (pXGI->CRT1Modes) {
-@@ -595,8 +599,8 @@ XGIFreeRec(ScrnInfoPtr pScrn)
-                 do {
-                     DisplayModePtr p = pScrn->currentMode->next;
-                     if (pScrn->currentMode->Private)
--                        xfree(pScrn->currentMode->Private);
--                    xfree(pScrn->currentMode);
-+                        free(pScrn->currentMode->Private);
-+                    free(pScrn->currentMode);
-                     pScrn->currentMode = p;
-                 } while (pScrn->currentMode != pScrn->modes);
-             }
-@@ -612,7 +616,7 @@ XGIFreeRec(ScrnInfoPtr pScrn)
-     pXGI->pVbe = NULL;
-     if (pScrn->driverPrivate == NULL)
-         return;
--    xfree(pScrn->driverPrivate);
-+    free(pScrn->driverPrivate);
-     pScrn->driverPrivate = NULL;
- }
- 
-@@ -975,7 +979,7 @@ XGIProbe(DriverPtr drv, int flags)
-                                     numDevSections, drv, &usedChips);
- 
-     /* Free it since we don't need that list after this */
--    xfree(devSections);
-+    free(devSections);
-     if (numUsed <= 0)
-         return FALSE;
- 
-@@ -1015,7 +1019,7 @@ XGIProbe(DriverPtr drv, int flags)
- 
- #endif
-         }
--    xfree(usedChips);
-+    free(usedChips);
- 
-     return foundScreen;
- }
-@@ -1044,11 +1048,11 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
- 
- 	ErrorF("XGICopyModeNLink()...Use Virtual Size-1\n");
- 
--    if (!((mode = xalloc(sizeof(DisplayModeRec)))))
-+    if (!((mode = malloc(sizeof(DisplayModeRec)))))
-         return dest;
-     memcpy(mode, i, sizeof(DisplayModeRec));
--    if (!((mode->Private = xalloc(sizeof(XGIMergedDisplayModeRec))))) {
--        xfree(mode);
-+    if (!((mode->Private = malloc(sizeof(XGIMergedDisplayModeRec))))) {
-+        free(mode);
-         return dest;
-     }
-     ((XGIMergedDisplayModePtr) mode->Private)->CRT1 = i;
-@@ -1125,8 +1129,8 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
-         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-                    "Skipped %dx%d, not enough video RAM or beyond hardware specs\n",
-                    mode->HDisplay, mode->VDisplay);
--        xfree(mode->Private);
--        xfree(mode);
-+        free(mode->Private);
-+        free(mode);
- 
-         return dest;
-     }
-@@ -1559,10 +1563,10 @@ XGIFreeCRT2Structs(XGIPtr pXGI)
-                                    pXGI->CRT2pScrn->monitor->Modes);
-             }
-             if (pXGI->CRT2pScrn->monitor->DDC)
--                xfree(pXGI->CRT2pScrn->monitor->DDC);
--            xfree(pXGI->CRT2pScrn->monitor);
-+                free(pXGI->CRT2pScrn->monitor->DDC);
-+            free(pXGI->CRT2pScrn->monitor);
-         }
--        xfree(pXGI->CRT2pScrn);
-+        free(pXGI->CRT2pScrn);
-         pXGI->CRT2pScrn = NULL;
-     }
- }
-@@ -2438,7 +2442,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
- 
- #ifdef XGIMERGED
-     if (pXGI->MergedFB) {
--        pXGI->CRT2pScrn->monitor = xalloc(sizeof(MonRec));
-+        pXGI->CRT2pScrn->monitor = malloc(sizeof(MonRec));
-         if (pXGI->CRT2pScrn->monitor) {
-             DisplayModePtr tempm = NULL, currentm = NULL, newm = NULL;
-             memcpy(pXGI->CRT2pScrn->monitor, pScrn->monitor, sizeof(MonRec));
-@@ -2446,11 +2450,11 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
-             pXGI->CRT2pScrn->monitor->Modes = NULL;
-             tempm = pScrn->monitor->Modes;
-             while (tempm) {
--                if (!(newm = xalloc(sizeof(DisplayModeRec))))
-+                if (!(newm = malloc(sizeof(DisplayModeRec))))
-                     break;
-                 memcpy(newm, tempm, sizeof(DisplayModeRec));
--                if (!(newm->name = xalloc(strlen(tempm->name) + 1))) {
--                    xfree(newm);
-+                if (!(newm->name = malloc(strlen(tempm->name) + 1))) {
-+                    free(newm);
-                     break;
-                 }
-                 strcpy(newm->name, tempm->name);
-@@ -2490,7 +2494,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
-                         "Failed to allocate memory for CRT2 monitor, %s.\n",
-                         mergeddisstr);
-             if (pXGI->CRT2pScrn)
--                xfree(pXGI->CRT2pScrn);
-+                free(pXGI->CRT2pScrn);
-             pXGI->CRT2pScrn = NULL;
-             pXGI->MergedFB = FALSE;
-         }
-@@ -3540,7 +3544,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
-         /* Do some MergedFB mode initialisation */
- #ifdef XGIMERGED
-         if (pXGI->MergedFB) {
--        pXGI->CRT2pScrn = xalloc(sizeof(ScrnInfoRec));
-+        pXGI->CRT2pScrn = malloc(sizeof(ScrnInfoRec));
-         if (!pXGI->CRT2pScrn) {
-             XGIErrorLog(pScrn,
-                         "Failed to allocate memory for 2nd pScrn, %s\n",
-@@ -3586,7 +3590,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
-                     XGIErrorLog(pScrn, mergednocrt1, mergeddisstr);
-                 }
-                 if (pXGI->CRT2pScrn)
--                    xfree(pXGI->CRT2pScrn);
-+                    free(pXGI->CRT2pScrn);
-                 pXGI->CRT2pScrn = NULL;
-                 pXGI->MergedFB = FALSE;
-             }
-@@ -3627,7 +3631,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
-                 XGIErrorLog(pScrn, mergednocrt2, mergeddisstr);
-             }
-             if (pXGI->CRT2pScrn)
--                xfree(pXGI->CRT2pScrn);
-+                free(pXGI->CRT2pScrn);
-             pXGI->CRT2pScrn = NULL;
-             pXGI->MergedFB = FALSE;
-         }
-@@ -4901,7 +4905,7 @@ XGIScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     if (pXGI->ShadowFB) {
-         pXGI->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
--        pXGI->ShadowPtr = xalloc(pXGI->ShadowPitch * height);
-+        pXGI->ShadowPtr = malloc(pXGI->ShadowPitch * height);
-         displayWidth = pXGI->ShadowPitch / (pScrn->bitsPerPixel >> 3);
-         FBStart = pXGI->ShadowPtr;
-     }
-@@ -5777,17 +5781,17 @@ XGICloseScreen(int scrnIndex, ScreenPtr pScreen)
-     }
- 
-     if (pXGI->ShadowPtr) {
--        xfree(pXGI->ShadowPtr);
-+        free(pXGI->ShadowPtr);
-         pXGI->ShadowPtr = NULL;
-     }
- 
-     if (pXGI->DGAModes) {
--        xfree(pXGI->DGAModes);
-+        free(pXGI->DGAModes);
-         pXGI->DGAModes = NULL;
-     }
- 
-     if (pXGI->adaptor) {
--        xfree(pXGI->adaptor);
-+        free(pXGI->adaptor);
-         pXGI->adaptor = NULL;
-         pXGI->ResetXv = pXGI->ResetXvGamma = NULL;
-     }
-diff --git a/src/xgi_opt.c b/src/xgi_opt.c
-index 09346e4..c0608d5 100755
---- a/src/xgi_opt.c
-+++ b/src/xgi_opt.c
-@@ -195,7 +195,7 @@ xgiOptions(ScrnInfoPtr pScrn)
-     xf86CollectOptions(pScrn, NULL);
- 
-     /* Process the options */
--    if(!(pXGI->Options = xalloc(sizeof(XGIOptions)))) return;
-+    if(!(pXGI->Options = malloc(sizeof(XGIOptions)))) return;
- 
-     memcpy(pXGI->Options, XGIOptions, sizeof(XGIOptions));
- 
-diff --git a/src/xgi_setup.c b/src/xgi_setup.c
-index c1d2cdc..6641b09 100755
---- a/src/xgi_setup.c
-+++ b/src/xgi_setup.c
-@@ -678,7 +678,7 @@ bAccessVGAPCIInfo(PXGI_HW_DEVICE_INFO pHwDevInfo, ULONG ulOffset, ULONG ulSet, U
- 	err = pci_device_cfg_write_u32(pXGI->PciInfo, *pulValue,
- 				       ulOffset & ~3);
-     } else {
--	err = pci_device_cfg_write_u32(pXGI->PciInfo, pulValue,
-+	err = pci_device_cfg_read_u32(pXGI->PciInfo, pulValue,
- 				       ulOffset & ~3);
-     }
- 
-diff --git a/src/xgi_video.c b/src/xgi_video.c
-index 31cffd5..df76d14 100755
---- a/src/xgi_video.c
-+++ b/src/xgi_video.c
-@@ -142,7 +142,7 @@ void XGIInitVideo(ScreenPtr pScreen)
-             adaptors = &newAdaptor;
-         } else {
-             newAdaptors =  /* need to free this someplace */
--                xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-+                malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
-             if(newAdaptors) {
-                 memcpy(newAdaptors, adaptors, num_adaptors *
-                                         sizeof(XF86VideoAdaptorPtr));
-@@ -157,7 +157,7 @@ void XGIInitVideo(ScreenPtr pScreen)
-         xf86XVScreenInit(pScreen, adaptors, num_adaptors);
- 
-     if(newAdaptors)
--        xfree(newAdaptors);
-+        free(newAdaptors);
- 
- }
- 
-@@ -395,7 +395,7 @@ XGISetupImageVideo(ScreenPtr pScreen)
-     struct v4l2_standard 	standard;
- # endif//VC    
- 
--    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
-+    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
-                             sizeof(XGIPortPrivRec) +
-                             sizeof(DevUnion))))
-         return NULL;
diff --git a/testing/xf86-video-xgixp/PKGBUILD b/testing/xf86-video-xgixp/PKGBUILD
deleted file mode 100644
index 344205523..000000000
--- a/testing/xf86-video-xgixp/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 136481 2011-08-30 08:44:33Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-xgixp
-pkgver=1.8.0
-pkgrel=4
-pkgdesc="X.org XGIXP video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
-conflicts=('xorg-server<1.10.99.902')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        api-compat-fix-for-DRAWABLE_BUFFER.patch)
-sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3'
-          'ea140a13963bbf33cdff1ad75789d765867ec53b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/api-compat-fix-for-DRAWABLE_BUFFER.patch"
-  ./configure --prefix=/usr
-  make
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch b/testing/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch
deleted file mode 100644
index f8cb64673..000000000
--- a/testing/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 86258a6fd8fc8bb09a52ee446b37abe6bd0843ef Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Fri, 25 Mar 2011 22:46:55 +0000
-Subject: API compat fix for DRAWABLE_BUFFER
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/xgi_driver.c b/src/xgi_driver.c
-index e54d8c7..189b84a 100644
---- a/src/xgi_driver.c
-+++ b/src/xgi_driver.c
-@@ -2708,7 +2708,9 @@ xg47_setup_fb_wrap(ReadMemoryProcPtr *read_ptr,
- {
-     switch (pDraw->type) {
-     case DRAWABLE_WINDOW:
-+#ifdef DRAWABLE_BUFFER
-     case DRAWABLE_BUFFER:
-+#endif
- 	*read_ptr = xg47_read_memory_swap_func;
- 	*write_ptr = xg47_write_memory_swap_func;
- 	break;
---
-cgit v0.8.3-6-g21f6
diff --git a/testing/xorg-server/10-quirks.conf b/testing/xorg-server/10-quirks.conf
deleted file mode 100644
index 7afad22dc..000000000
--- a/testing/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/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD
deleted file mode 100644
index 1de69bf3c..000000000
--- a/testing/xorg-server/PKGBUILD
+++ /dev/null
@@ -1,193 +0,0 @@
-# $Id: PKGBUILD 140222 2011-10-10 09:08:07Z jgc $
-# 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.11.1
-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')
-options=('!libtool')
-source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
-        autoconfig-nvidia.patch
-        autoconfig-sis.patch
-        revert-trapezoids.patch
-        git-fixes.patch
-        xvfb-run
-        xvfb-run.1
-        10-quirks.conf)
-sha1sums=('ed0358b61294f1283aad42cf1e609752ceeffafd'
-          '0249b892f27243d8fe6fe6d226bf4c2391cedf49'
-          '962fecc159c128728f14e8ba231c5b00391ff4ac'
-          'd9f7d9553e772c2682c15079019d30c658a4f83b'
-          'd73125bf93aea09b0beb55e75c510b9f72f5d21a'
-          'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
-          '6838fc00ef4618c924a77e0fb03c05346080908a'
-          '993798f3d22ad672d769dae5f48d1fa068d5578f')
-
-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"
-
-  # Revert commit that causes huge slowdowns with binary nVidia driver
-  patch -Np1 -i "${srcdir}/revert-trapezoids.patch"
-
-  # Add post-release patches from 1.11 branch
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-
-  autoreconf
-  ./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-install-setuid \
-      --enable-config-udev \
-      --disable-config-dbus \
-      --enable-record \
-      --disable-xfbdev \
-      --disable-xfake \
-      --disable-static \
-      --sysconfdir=/etc/X11 \
-      --localstatedir=/var \
-      --with-xkb-path=/usr/share/X11/xkb \
-      --with-xkb-output=/var/lib/xkb \
-      --with-fontrootdir=/usr/share/fonts
-  make
-
-  # Disable subdirs for make install rule to make splitting easier
-  sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
-      -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
-      -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
-      -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \
-      -i hw/Makefile
-}
-
-package_xorg-server-common() {
-  pkgdesc="Xorg server common files"
-  depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
-  
-  make -C xkb DESTDIR="${pkgdir}" install-data
-
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/lib/xorg"
-  install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
-}
-
-package_xorg-server() {
-  pkgdesc="Xorg X server"
-  depends=(libxdmcp libxfont udev libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev)
-  backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf')
-  provides=('x-server')
-  groups=('xorg')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/X11"
-  mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/"
-  install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-
-  rmdir "${pkgdir}/usr/share/X11"
-
-  # Needed for non-mesa drivers, libgl will restore it
-  mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
-     "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
-
-  rm -rf "${pkgdir}/var"
-
-  rm -f "${pkgdir}/usr/share/man/man1/Xserver.1"
-  rm -f "${pkgdir}/usr/lib/xorg/protocol.txt"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING"
-
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/share/aclocal"
-}
-
-package_xorg-server-xephyr() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING"
-}
-
-package_xorg-server-xvfb() {
-  pkgdesc="Virtual framebuffer X server"
-  depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-  install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING"
-}
-
-package_xorg-server-xnest() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libxext libgcrypt pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING"
-}
-
-package_xorg-server-xdmx() {
-  pkgdesc="Distributed Multihead X Server and utilities"
-  depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING"
-}
-
-package_xorg-server-devel() {
-  pkgdesc="Development files for the X.Org X server"
-  depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/bin"
-  rm -rf "${pkgdir}/usr/share/man"
-  rm -rf "${pkgdir}/usr/share/doc"
-  rm -rf "${pkgdir}/usr/share/X11"
-  rm -rf "${pkgdir}/usr/lib/xorg"
-  rm -rf "${pkgdir}/var"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
-}
diff --git a/testing/xorg-server/autoconfig-nvidia.patch b/testing/xorg-server/autoconfig-nvidia.patch
deleted file mode 100644
index baa2eb601..000000000
--- a/testing/xorg-server/autoconfig-nvidia.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/hw/xfree86/common/xf86pciBus.c
-+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -1123,7 +1123,25 @@ videoPtrToDriverList(struct pci_device *
- 	    break;
- 	case 0x102b:		    driverList[0] = "mga";	break;
- 	case 0x10c8:		    driverList[0] = "neomagic"; break;
--	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
-+	case 0x10de: case 0x12d2:
-+	    switch (dev->device_id) {
-+	    /* NV1 */
-+	    case 0x0008:
-+	    case 0x0009:
-+		driverList[0] = "vesa";
-+		break;
-+	    /* NV3 */
-+	    case 0x0018:
-+	    case 0x0019:
-+		driverList[0] = "nv";
-+		break;
-+	    default:
-+		driverList[0] = "nouveau";
-+		driverList[1] = "nv";
-+		driverList[2] = "nvidia";
-+		break;
-+	    }
-+	    break;
- 	case 0x1106:		    driverList[0] = "openchrome"; break;
-         case 0x1b36:		    driverList[0] = "qxl"; break;
- 	case 0x1163:		    driverList[0] = "rendition"; break;
diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch
deleted file mode 100644
index d936efaaa..000000000
--- a/testing/xorg-server/autoconfig-sis.patch
+++ /dev/null
@@ -1,19 +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
-@@ -1140,7 +1140,15 @@
- 		    driverList[0] = "savage"; 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;
- 	case 0x121a:
- 	    if (dev->device_id < 0x0003)
diff --git a/testing/xorg-server/git-fixes.patch b/testing/xorg-server/git-fixes.patch
deleted file mode 100644
index 3c59c27c9..000000000
--- a/testing/xorg-server/git-fixes.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-From bd6ea85209e5ab80375d4ec9994d10a89fd1374a Mon Sep 17 00:00:00 2001
-From: Jamey Sharp <jamey@minilop.net>
-Date: Wed, 15 Sep 2010 01:35:21 +0000
-Subject: Fix pixmap double-frees on error paths.
-
-If AddResource fails, it will automatically free the object that was
-passed to it by calling the appropriate deleteFunc; and of course
-FreeResource also calls the deleteFunc. In both cases it's wrong to call
-the destroy hook manually.
-
-Commit by Jamey Sharp and Josh Triplett.
-
-Signed-off-by: Jamey Sharp <jamey@minilop.net>
-Signed-off-by: Josh Triplett <josh@joshtriplett.org>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
-(cherry picked from commit 0f380a5005f800572773cd4667ce43c7459cc467)
----
-diff --git a/Xext/shm.c b/Xext/shm.c
-index b08af82..4141a8f 100644
---- a/Xext/shm.c
-+++ b/Xext/shm.c
-@@ -991,7 +991,6 @@ CreatePmap:
- 	    pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
- 	    pMap->drawable.id = newPix->info[j].id;
- 	    if (!AddResource(newPix->info[j].id, RT_PIXMAP, (pointer)pMap)) {
--		(*pScreen->DestroyPixmap)(pMap);
- 		result = BadAlloc;
- 		break;
- 	    }
-@@ -1002,10 +1001,8 @@ CreatePmap:
-     }
- 
-     if(result == BadAlloc) {
--	while(j--) {
--	    (*pScreen->DestroyPixmap)(pMap);
-+	while(j--)
- 	    FreeResource(newPix->info[j].id, RT_NONE);
--	}
- 	free(newPix);
-     } else 
- 	AddResource(stuff->pid, XRT_PIXMAP, newPix);
-@@ -1110,7 +1107,6 @@ CreatePmap:
- 	{
- 	    return Success;
- 	}
--	pDraw->pScreen->DestroyPixmap(pMap);
-     }
-     return BadAlloc;
- }
-diff --git a/dix/dispatch.c b/dix/dispatch.c
-index 192c8c3..f8200b1 100644
---- a/dix/dispatch.c
-+++ b/dix/dispatch.c
-@@ -1419,7 +1419,6 @@ CreatePmap:
- 	}
- 	if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap))
- 	    return Success;
--	(*pDraw->pScreen->DestroyPixmap)(pMap);
-     }
-     return BadAlloc;
- }
---
-cgit v0.9.0.2-2-gbebe
-From 347f5610ca023fb31485aa19c20607af8bf9c834 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Tue, 30 Aug 2011 22:46:52 +0000
-Subject: Xi: Fix passive XI2 ungrabs on XIAll[Master]Devices
-
-The corresponding DeviceIntPtr wasn't being gotten properly,
-resulting in BadDevice from dixLookupDevice().
-
-Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
-Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit f52d5cd374563544dafe29587411f345e31bbdf8)
----
-diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
-index ae43433..5cdd8ac 100644
---- a/Xi/xipassivegrab.c
-+++ b/Xi/xipassivegrab.c
-@@ -261,9 +261,16 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
-     REQUEST(xXIPassiveUngrabDeviceReq);
-     REQUEST_AT_LEAST_SIZE(xXIPassiveUngrabDeviceReq);
- 
--    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
--    if (rc != Success)
--	return rc;
-+    if (stuff->deviceid == XIAllDevices)
-+        dev = inputInfo.all_devices;
-+    else if (stuff->deviceid == XIAllMasterDevices)
-+        dev = inputInfo.all_master_devices;
-+    else
-+    {
-+        rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess);
-+        if (rc != Success)
-+	    return rc;
-+    }
- 
-     if (stuff->grab_type != XIGrabtypeButton &&
-         stuff->grab_type != XIGrabtypeKeycode &&
---
-cgit v0.9.0.2-2-gbebe
-From e9ae33316012ffe9acfeeb7303ab3392c2ca2a2b Mon Sep 17 00:00:00 2001
-From: Sam Spilsbury <sam.spilsbury@canonical.com>
-Date: Wed, 14 Sep 2011 01:58:34 +0000
-Subject: Remove the SendEvent bit (0x80) before doing range checks on event type.
-
-Some extension libraries may set this bit before converting the event to
-wire protocol and as such range checking the event will cause an invalid
-BadValue error to result. As the documentation suggests the the bit
-should be "forced on", remove it before doing range checks and continue
-to force it on in the server.
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-(cherry picked from commit 2d2dce558d24eeea0eb011ec9ebaa6c5c2273c39)
----
-diff --git a/dix/events.c b/dix/events.c
-index 8a4c6b9..9e58edb 100644
---- a/dix/events.c
-+++ b/dix/events.c
-@@ -5224,6 +5224,8 @@ CloseDownEvents(void)
-     InputEventList = NULL;
- }
- 
-+#define SEND_EVENT_BIT 0x80
-+
- /**
-  * Server-side protocol handling for SendEvent request.
-  *
-@@ -5241,6 +5243,16 @@ ProcSendEvent(ClientPtr client)
- 
-     REQUEST_SIZE_MATCH(xSendEventReq);
- 
-+    /* libXext and other extension libraries may set the bit indicating
-+     * that this event came from a SendEvent request so remove it
-+     * since otherwise the event type may fail the range checks
-+     * and cause an invalid BadValue error to be returned.
-+     *
-+     * This is safe to do since we later add the SendEvent bit (0x80)
-+     * back in once we send the event to the client */
-+
-+    stuff->event.u.u.type &= ~(SEND_EVENT_BIT);
-+
-     /* The client's event type must be a core event type or one defined by an
- 	extension. */
- 
-@@ -5298,7 +5310,7 @@ ProcSendEvent(ClientPtr client)
- 	client->errorValue = stuff->propagate;
- 	return BadValue;
-     }
--    stuff->event.u.u.type |= 0x80;
-+    stuff->event.u.u.type |= SEND_EVENT_BIT;
-     if (stuff->propagate)
-     {
- 	for (;pWin; pWin = pWin->parent)
---
-cgit v0.9.0.2-2-gbebe
-From b45e22675364915c32560c26404cf30d77ab68aa Mon Sep 17 00:00:00 2001
-From: Alan Hourihane <alanh@vmware.com>
-Date: Wed, 05 Oct 2011 02:42:46 +0000
-Subject: dixfonts: Don't overwrite local c variable until new_closure is safely initialized.
-
-Signed-off-by: Alan Hourihane <alanh@vmware.com>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-(cherry picked from commit 7a33c5b934382b5554f41ab1502514e91c9bc52e)
----
-diff --git a/dix/dixfonts.c b/dix/dixfonts.c
-index fbac124..d2bcb84 100644
---- a/dix/dixfonts.c
-+++ b/dix/dixfonts.c
-@@ -1302,31 +1302,30 @@ doPolyText(ClientPtr client, PTclosurePtr c)
- 			goto bail;
- 		    }
- 		    *new_closure = *c;
--		    c = new_closure;
- 
--		    len = c->endReq - c->pElt;
--		    c->data = malloc(len);
--		    if (!c->data)
-+		    len = new_closure->endReq - new_closure->pElt;
-+		    new_closure->data = malloc(len);
-+		    if (!new_closure->data)
- 		    {
--			free(c);
-+			free(new_closure);
- 			err = BadAlloc;
- 			goto bail;
- 		    }
--		    memmove(c->data, c->pElt, len);
--		    c->pElt = c->data;
--		    c->endReq = c->pElt + len;
-+		    memmove(new_closure->data, new_closure->pElt, len);
-+		    new_closure->pElt = new_closure->data;
-+		    new_closure->endReq = new_closure->pElt + len;
- 
- 		    /* Step 2 */
- 
--		    pGC = GetScratchGC(c->pGC->depth, c->pGC->pScreen);
-+		    pGC = GetScratchGC(new_closure->pGC->depth, new_closure->pGC->pScreen);
- 		    if (!pGC)
- 		    {
--			free(c->data);
--			free(c);
-+			free(new_closure->data);
-+			free(new_closure);
- 			err = BadAlloc;
- 			goto bail;
- 		    }
--		    if ((err = CopyGC(c->pGC, pGC, GCFunction |
-+		    if ((err = CopyGC(new_closure->pGC, pGC, GCFunction |
- 				      GCPlaneMask | GCForeground |
- 				      GCBackground | GCFillStyle |
- 				      GCTile | GCStipple |
-@@ -1337,15 +1336,16 @@ doPolyText(ClientPtr client, PTclosurePtr c)
- 				      Success)
- 		    {
- 			FreeScratchGC(pGC);
--			free(c->data);
--			free(c);
-+			free(new_closure->data);
-+			free(new_closure);
- 			err = BadAlloc;
- 			goto bail;
- 		    }
-+		    c = new_closure;
- 		    origGC = c->pGC;
- 		    c->pGC = pGC;
- 		    ValidateGC(c->pDraw, c->pGC);
--		    
-+
- 		    ClientSleep(client, (ClientSleepProcPtr)doPolyText, c);
- 
- 		    /* Set up to perform steps 3 and 4 */
---
-cgit v0.9.0.2-2-gbebe
-From bec15eb73a17fb47963ff6b747ea504f7dc05deb Mon Sep 17 00:00:00 2001
-From: Kirill Elagin <kirelagin@gmail.com>
-Date: Tue, 04 Oct 2011 19:02:20 +0000
-Subject: Fix server crash due to invalid images
-
-See https://bugs.freedesktop.org/show_bug.cgi?id=39383
-
-Signed-off-by: Kirill Elagin <kirelagin@gmail.com>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-(cherry picked from commit 53611213396479abfdce0f7752681572e0d26d78)
----
-diff --git a/fb/fbpict.c b/fb/fbpict.c
-index d1fd0cb..57c93fd 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
-@@ -163,7 +163,9 @@ create_bits_picture (PicturePtr pict,
- 	(pixman_format_code_t)pict->format,
- 	pixmap->drawable.width, pixmap->drawable.height,
- 	(uint32_t *)bits, stride * sizeof (FbStride));
--    
-+
-+    if (!image)
-+	return NULL;
-     
- #ifdef FB_ACCESS_WRAPPER
- #if FB_SHIFT==5
---
-cgit v0.9.0.2-2-gbebe
-From 65469f5ea98074ab27ce0a2d482157b9d5c2cbc7 Mon Sep 17 00:00:00 2001
-From: vdb@picaros.org <vdb@picaros.org>
-Date: Sat, 17 Sep 2011 16:55:47 +0000
-Subject: Fix a rare memory leak
-
-Signed-off-by: Servaas Vandenberghe <vdb@picaros.org>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-(cherry picked from commit e4cddf509e1729e8ff40354275b65455111ad2bd)
----
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index c2814d4..3fae039 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -133,6 +133,7 @@ xf86CrtcCreate (ScrnInfoPtr		scrn,
- 	crtcs = malloc((xf86_config->num_crtc + 1) * sizeof (xf86CrtcPtr));
-     if (!crtcs)
-     {
-+	free(crtc->gamma_red);
- 	free(crtc);
- 	return NULL;
-     }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xorg-server/revert-trapezoids.patch b/testing/xorg-server/revert-trapezoids.patch
deleted file mode 100644
index b9046c5cb..000000000
--- a/testing/xorg-server/revert-trapezoids.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-diff -ru a/fb/fbpict.c b/fb/fbpict.c
---- a/fb/fbpict.c	2011-08-01 01:44:24.000000000 +0200
-+++ b/fb/fbpict.c	2011-10-05 22:45:29.000000000 +0200
-@@ -364,7 +364,7 @@
-     ps->Glyphs = miGlyphs;
-     ps->CompositeRects = miCompositeRects;
-     ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
--    ps->Trapezoids = fbTrapezoids;
-+    ps->Trapezoids = miTrapezoids;
-     ps->AddTraps = fbAddTraps;
-     ps->AddTriangles = fbAddTriangles;
-     ps->Triangles = fbTriangles;
-diff -ru a/render/mipict.c b/render/mipict.c
---- a/render/mipict.c	2011-04-04 05:19:50.000000000 +0200
-+++ b/render/mipict.c	2011-10-05 22:02:53.000000000 +0200
-@@ -573,6 +573,67 @@
-     }
- }
- 
-+void
-+miTrapezoids (CARD8	    op,
-+	      PicturePtr    pSrc,
-+	      PicturePtr    pDst,
-+	      PictFormatPtr maskFormat,
-+	      INT16	    xSrc,
-+	      INT16	    ySrc,
-+	      int	    ntrap,
-+	      xTrapezoid    *traps)
-+{
-+    ScreenPtr		pScreen = pDst->pDrawable->pScreen;
-+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
-+
-+    /*
-+     * Check for solid alpha add
-+     */
-+    if (op == PictOpAdd && miIsSolidAlpha (pSrc))
-+    {
-+	for (; ntrap; ntrap--, traps++)
-+	    (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0);
-+    } 
-+    else if (maskFormat)
-+    {
-+	PicturePtr	pPicture;
-+	BoxRec		bounds;
-+	INT16		xDst, yDst;
-+	INT16		xRel, yRel;
-+	
-+	xDst = traps[0].left.p1.x >> 16;
-+	yDst = traps[0].left.p1.y >> 16;
-+
-+	miTrapezoidBounds (ntrap, traps, &bounds);
-+	if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
-+	    return;
-+	pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat,
-+					 bounds.x2 - bounds.x1,
-+					 bounds.y2 - bounds.y1);
-+	if (!pPicture)
-+	    return;
-+	for (; ntrap; ntrap--, traps++)
-+	    (*ps->RasterizeTrapezoid) (pPicture, traps, 
-+				       -bounds.x1, -bounds.y1);
-+	xRel = bounds.x1 + xSrc - xDst;
-+	yRel = bounds.y1 + ySrc - yDst;
-+	CompositePicture (op, pSrc, pPicture, pDst,
-+			  xRel, yRel, 0, 0, bounds.x1, bounds.y1,
-+			  bounds.x2 - bounds.x1,
-+			  bounds.y2 - bounds.y1);
-+	FreePicture (pPicture, 0);
-+    }
-+    else
-+    {
-+	if (pDst->polyEdge == PolyEdgeSharp)
-+	    maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-+	else
-+	    maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-+	for (; ntrap; ntrap--, traps++)
-+	    miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps);
-+    }
-+}
-+
- Bool
- miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
- {
-@@ -599,7 +660,7 @@
-     ps->Composite	= 0;			/* requires DDX support */
-     ps->Glyphs		= miGlyphs;
-     ps->CompositeRects	= miCompositeRects;
--    ps->Trapezoids	= 0;
-+    ps->Trapezoids	= miTrapezoids;
-     ps->Triangles	= 0;
-     
-     ps->RasterizeTrapezoid = 0;			/* requires DDX support */
-diff -ru a/render/mipict.h b/render/mipict.h
---- a/render/mipict.h	2011-04-04 05:19:50.000000000 +0200
-+++ b/render/mipict.h	2011-10-05 22:06:19.000000000 +0200
-@@ -129,6 +129,23 @@
- 		      CARD32	    pixel,
- 		      xRenderColor  *color);
- 
-+extern _X_EXPORT PicturePtr
-+miCreateAlphaPicture (ScreenPtr	    pScreen, 
-+		      PicturePtr    pDst,
-+		      PictFormatPtr pPictFormat,
-+		      CARD16	    width,
-+		      CARD16	    height);
-+
-+extern _X_EXPORT void
-+miTrapezoids (CARD8	    op,
-+	      PicturePtr    pSrc,
-+	      PicturePtr    pDst,
-+	      PictFormatPtr maskFormat,
-+	      INT16	    xSrc,
-+	      INT16	    ySrc,
-+	      int	    ntrap,
-+	      xTrapezoid    *traps);
-+
- extern _X_EXPORT Bool
- miIsSolidAlpha (PicturePtr pSrc);
- 
-diff -ru a/render/mitrap.c b/render/mitrap.c
---- a/render/mitrap.c	2011-04-04 05:19:50.000000000 +0200
-+++ b/render/mitrap.c	2011-10-05 22:05:29.000000000 +0200
-@@ -34,6 +34,55 @@
- #include "picturestr.h"
- #include "mipict.h"
- 
-+PicturePtr
-+miCreateAlphaPicture (ScreenPtr	    pScreen, 
-+		      PicturePtr    pDst,
-+		      PictFormatPtr pPictFormat,
-+		      CARD16	    width,
-+		      CARD16	    height)
-+{
-+    PixmapPtr	    pPixmap;
-+    PicturePtr	    pPicture;
-+    GCPtr	    pGC;
-+    int		    error;
-+    xRectangle	    rect;
-+
-+    if (width > 32767 || height > 32767)
-+	return 0;
-+
-+    if (!pPictFormat)
-+    {
-+	if (pDst->polyEdge == PolyEdgeSharp)
-+	    pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-+	else
-+	    pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-+	if (!pPictFormat)
-+	    return 0;
-+    }
-+
-+    pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, 
-+					pPictFormat->depth, 0);
-+    if (!pPixmap)
-+	return 0;
-+    pGC = GetScratchGC (pPixmap->drawable.depth, pScreen);
-+    if (!pGC)
-+    {
-+	(*pScreen->DestroyPixmap) (pPixmap);
-+	return 0;
-+    }
-+    ValidateGC (&pPixmap->drawable, pGC);
-+    rect.x = 0;
-+    rect.y = 0;
-+    rect.width = width;
-+    rect.height = height;
-+    (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect);
-+    FreeScratchGC (pGC);
-+    pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat,
-+			      0, 0, serverClient, &error);
-+    (*pScreen->DestroyPixmap) (pPixmap);
-+    return pPicture;
-+}
-+
- static xFixed
- miLineFixedX (xLineFixed *l, xFixed y, Bool ceil)
- {
-
diff --git a/testing/xorg-server/xvfb-run b/testing/xorg-server/xvfb-run
deleted file mode 100644
index 4c2f4e0d3..000000000
--- a/testing/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/testing/xorg-server/xvfb-run.1 b/testing/xorg-server/xvfb-run.1
deleted file mode 100644
index 137d3a196..000000000
--- a/testing/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/testing/xorg-xdm/LICENSE b/testing/xorg-xdm/LICENSE
deleted file mode 100644
index 5f8d6fcc0..000000000
--- a/testing/xorg-xdm/LICENSE
+++ /dev/null
@@ -1,132 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/app/
-
-Copyright 1988, 1989, 1990, 1991, 1994, 1998  
-The Open Group
-Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-prngc.c:
-Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
-Copyright (c) 2001-2002 Damien Miller.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-dm_socket.h, dm_error.h, dm_auth.h
-Copyright 1998 by Thomas E. Dickey <dickey@clark.net>
-
-                        All Rights Reserved
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name(s) of the above copyright
-holders shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Software without prior written
-authorization.
-
-genauth.c:
-Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999.  All
-rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, and the entire permission notice in its entirety,
-   including the disclaimer of warranties.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote
-   products derived from this software without specific prior
-   written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
-WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
-
-Makefile.am
-Copyright 2005  Red Hat, Inc.
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Red Hat not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Red Hat makes no
-representations about the suitability of this software for any purpose. It
-is provided "as is" without express or implied warranty.
-
-RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
diff --git a/testing/xorg-xdm/PKGBUILD b/testing/xorg-xdm/PKGBUILD
deleted file mode 100644
index 38924762a..000000000
--- a/testing/xorg-xdm/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 140230 2011-10-10 10:30:55Z jgc $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-pkgname=xorg-xdm
-pkgver=1.1.11
-pkgrel=1
-pkgdesc="X Display Manager"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'consolekit')
-makedepends=('pkgconfig' 'xorg-util-macros')
-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-consolekit.patch
-        xdm.pam)
-md5sums=('64a1af1f7eb69feae12e75d4cc3aaf19'
-         '234ae568e7b22cbc09433bb396ff3d80'
-         '2c30078c50bc653d72eb5114506eb313'
-         '46b11173b58e2241577d5ffd48ab8f8d'
-         '419d6289ba6f851135f5c70c0e3cbec4')
-sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47'
-            'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff'
-            '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb'
-            '47190f311c97c0d85b1fcab47ee5a8575013db1200a5e30a57a7ea4ef3e0c23a'
-            '36cf924a893ef851855ebcdc5468523a9d182c3620698e01dffc35d05d74764b')
-
-build() {
-  cd "${srcdir}/xdm-${pkgver}"
-  patch -Np0 -i "${srcdir}/Xsession-loginshell.patch"
-  patch -Np1 -i "${srcdir}/Xsession-xsm.patch"
-  patch -Np1 -i "${srcdir}/xdm-consolekit.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
-  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/*
-}
diff --git a/testing/xorg-xdm/Xsession-loginshell.patch b/testing/xorg-xdm/Xsession-loginshell.patch
deleted file mode 100644
index 3710752ef..000000000
--- a/testing/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/testing/xorg-xdm/Xsession-xsm.patch b/testing/xorg-xdm/Xsession-xsm.patch
deleted file mode 100644
index a2d4d6cc6..000000000
--- a/testing/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/testing/xorg-xdm/xdm-consolekit.patch b/testing/xorg-xdm/xdm-consolekit.patch
deleted file mode 100644
index 7d85b97e0..000000000
--- a/testing/xorg-xdm/xdm-consolekit.patch
+++ /dev/null
@@ -1,225 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -362,6 +362,20 @@
- 
- AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes)
- 
-+# ConsoleKit support
-+AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]),
-+	[USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes])
-+if test x"$USE_CONSOLEKIT" != xno; then
-+	PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector,
-+		[USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no])
-+	if test x"$USE_CONSOLEKIT" = xyes; then
-+		AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit])
-+		XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS -DUSE_CONSOLEKIT"
-+		XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS"
-+	fi
-+fi
-+dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes)
-+
- #
- #  XDM
- #
---- a/xdm/session.c
-+++ b/xdm/session.c
-@@ -66,6 +66,11 @@
- #endif
- #endif /* USE_PAM */
- 
-+#ifdef USE_CONSOLEKIT
-+#include <ck-connector.h>
-+#include <dbus/dbus.h>
-+#endif
-+
- #ifdef __SCO__
- #include <prot.h>
- #endif
-@@ -472,6 +477,97 @@
-     }
- }
- 
-+#ifdef USE_CONSOLEKIT
-+
-+static CkConnector *connector;
-+
-+static int openCKSession(struct verify_info *verify, struct display *d)
-+{
-+    int ret;
-+    DBusError error;
-+    char  *remote_host_name = "";
-+    dbus_bool_t is_local;
-+    char *display_name = "";
-+    char *display_device = "";
-+    char devtmp[16];
-+
-+    if (!use_consolekit)
-+	return 1;
-+
-+    is_local = d->displayType.location == Local;
-+    if (d->peerlen > 0 && d->peer)
-+	remote_host_name = d->peer;
-+    if (d->name)
-+	display_name = d->name;
-+    /* how can we get the corresponding tty at best...? */
-+    if (d->windowPath) {
-+	display_device = strchr(d->windowPath, ':');
-+	if (display_device && display_device[1])
-+	    display_device++;
-+	else
-+	    display_device = d->windowPath;
-+	snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device);
-+	display_device = devtmp;
-+    }
-+
-+    connector = ck_connector_new();
-+    if (!connector) {
-+	LogOutOfMem("ck_connector");
-+	return 0;
-+    }
-+
-+    dbus_error_init(&error);
-+    ret = ck_connector_open_session_with_parameters(
-+		connector, &error,
-+		"unix-user", &verify->uid,
-+		"x11-display", &display_name,
-+		"x11-display-device", &display_device,
-+		"remote-host-name", &remote_host_name,
-+		"is-local", &is_local,
-+		NULL);
-+    if (!ret) {
-+	if (dbus_error_is_set(&error)) {
-+	    LogError("Dbus error: %s\n", error.message);
-+	    dbus_error_free(&error);
-+	} else {
-+	    LogError("ConsoleKit error\n");
-+	}
-+	LogError("console-kit-daemon not running?\n");
-+	ck_connector_unref(connector);
-+	connector = NULL;
-+	return 0;
-+    }
-+
-+    verify->userEnviron = setEnv(verify->userEnviron,
-+		"XDG_SESSION_COOKIE", ck_connector_get_cookie(connector));
-+    return 1;
-+}
-+
-+static void closeCKSession(void)
-+{
-+    DBusError error;
-+
-+    if (!connector)
-+	return;
-+
-+    dbus_error_init(&error);
-+    if (!ck_connector_close_session(connector, &error)) {
-+	if (dbus_error_is_set(&error)) {
-+	    LogError("Dbus error: %s\n", error.message);
-+	    dbus_error_free(&error);
-+	} else {
-+	    LogError("ConsoleKit close error\n");
-+	}
-+	LogError("console-kit-daemon not running?\n");
-+    }
-+    ck_connector_unref(connector);
-+    connector = NULL;
-+}
-+#else
-+#define openCKSession(v,d)	1
-+#define closeCKSession()
-+#endif
-+
- void
- SessionExit (struct display *d, int status, int removeAuth)
- {
-@@ -486,6 +580,8 @@
-     }
- #endif
- 
-+    closeCKSession();
-+
-     /* make sure the server gets reset after the session is over */
-     if (d->serverPid >= 2 && d->resetSignal)
- 	kill (d->serverPid, d->resetSignal);
-@@ -568,6 +664,10 @@
- #ifdef USE_PAM
-     if (pamh) pam_open_session(pamh, 0);
- #endif
-+
-+    if (!openCKSession(verify, d))
-+	return 0;
-+
-     switch (pid = fork ()) {
-     case 0:
- 	CleanUpChild ();
---- a/include/dm.h
-+++ b/include/dm.h
-@@ -325,6 +325,9 @@
- extern char	*prngdSocket;
- extern int	prngdPort;
- # endif
-+#ifdef USE_CONSOLEKIT
-+extern int	use_consolekit;
-+#endif
- 
- extern char	*greeterLib;
- extern char	*willing;
---- a/xdm/resource.c
-+++ b/xdm/resource.c
-@@ -68,6 +68,9 @@
- char	*prngdSocket;
- int	prngdPort;
- #endif
-+#ifdef USE_CONSOLEKIT
-+int	use_consolekit;
-+#endif
- 
- char	*greeterLib;
- char	*willing;
-@@ -258,6 +261,10 @@
- 				"false"} ,
- { "willing",	"Willing",	DM_STRING,	&willing,
- 				""} ,
-+#ifdef USE_CONSOLEKIT
-+{ "consoleKit",	"ConsoleKit",	DM_BOOL,	(char **) &use_consolekit,
-+				"true"} ,
-+#endif
- };
- 
- # define NUM_DM_RESOURCES	(sizeof DmResources / sizeof DmResources[0])
-@@ -440,7 +447,11 @@
- {"-debug",	"*debugLevel",		XrmoptionSepArg,	(caddr_t) NULL },
- {"-xrm",	NULL,			XrmoptionResArg,	(caddr_t) NULL },
- {"-daemon",	".daemonMode",		XrmoptionNoArg,		"true"         },
--{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        }
-+{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        },
-+#ifdef USE_CONSOLEKIT
-+{"-consolekit",	".consoleKit",		XrmoptionNoArg,		"true"  },
-+{"-noconsolekit", ".consoleKit",	XrmoptionNoArg,		"false" }
-+#endif
- };
- 
- static int	originalArgc;
---- a/man/xdm.man
-+++ b/man/xdm.man
-@@ -51,6 +51,8 @@
- ] [
- .B \-session
- .I session_program
-+] [
-+.B \-noconsolekit
- ]
- .SH DESCRIPTION
- .I Xdm
-@@ -218,6 +220,10 @@
- .IP "\fB\-xrm\fP \fIresource_specification\fP"
- Allows an arbitrary resource to be specified, as in most
- X Toolkit applications.
-+.IP "\fB\-noconsolekit\fP"
-+Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP
-+resource.
-+This suppresses the session management using ConsoleKit.
- .SH RESOURCES
- At many stages the actions of
- .I xdm
diff --git a/testing/xorg-xdm/xdm.pam b/testing/xorg-xdm/xdm.pam
deleted file mode 100644
index 862b83fa2..000000000
--- a/testing/xorg-xdm/xdm.pam
+++ /dev/null
@@ -1,8 +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
diff --git a/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff b/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff
deleted file mode 100644
index 99e8a6754..000000000
--- a/testing/xorg-xinit/06_move_serverauthfile_into_tmp.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Move startx auth files in /tmp so they are removed on reboot.
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=357736
-The trap patch didn't seem to work on reboot.
----
- startx.cpp |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: xinit/startx.cpp
-===================================================================
---- xinit.orig/startx.cpp
-+++ xinit/startx.cpp
-@@ -273,7 +273,7 @@
-     dummy=0
- 
-     XCOMM create a file with auth information for the server. ':0' is a dummy.
--    xserverauthfile=$HOME/.serverauth.$$
-+    xserverauthfile=`mktemp -p /tmp serverauth.XXXXXXXXXX`
-     trap "rm -f '$xserverauthfile'" HUP INT QUIT ILL TRAP KILL BUS TERM
-     xauth -q -f "$xserverauthfile" << EOF
- add :$dummy . $mcookie
diff --git a/testing/xorg-xinit/PKGBUILD b/testing/xorg-xinit/PKGBUILD
deleted file mode 100644
index 9328da501..000000000
--- a/testing/xorg-xinit/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 137005 2011-09-05 06:01:09Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xorg-xinit
-pkgver=1.3.1
-pkgrel=1
-pkgdesc="X.Org initialisation program "
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libx11' 'xorg-xauth')
-makedepends=('xorg-util-macros')
-optdepends=('xorg-twm' 'xterm')
-backup=('etc/skel/.xinitrc'
-        'etc/skel/.xsession'
-        'etc/X11/xinit/xserverrc'
-        'etc/X11/xinit/xinitrc')
-source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
-        06_move_serverauthfile_into_tmp.diff
-        xinitrc
-        xsession
-        xserverrc)
-options=(!emptydirs)
-md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4'
-         'abd072ec435ce084cf4e89c58f83d45c'
-         'c7b406c3c5c1e8011b3ac7d6b29c1a2c'
-         '7873d97db30d6c279ed37e3559e7c59d'
-         'c5baef10fdb7239594daee72a94ddab3')
-
-build() {
-  cd "${srcdir}/xinit-${pkgver}"
-  patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
-  sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
-  ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
-  make
-}
-
-package() {
-  cd "${srcdir}/xinit-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/skel"
-  install -m644 "${srcdir}/xinitrc" "${pkgdir}/etc/skel/.xinitrc"
-  install -m644 "${srcdir}/xsession" "${pkgdir}/etc/skel/.xsession"
-  install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xorg-xinit/xinitrc b/testing/xorg-xinit/xinitrc
deleted file mode 100644
index dbd080d00..000000000
--- a/testing/xorg-xinit/xinitrc
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  for f in /etc/X11/xinit/xinitrc.d/*; do
-    [ -x "$f" ] && . "$f"
-  done
-  unset f
-fi
-
-# exec gnome-session
-# exec startkde
-# exec startxfce4
-# ...or the Window Manager of your choice
diff --git a/testing/xorg-xinit/xserverrc b/testing/xorg-xinit/xserverrc
deleted file mode 100644
index 6f746cdce..000000000
--- a/testing/xorg-xinit/xserverrc
+++ /dev/null
@@ -1 +0,0 @@
-exec /usr/bin/X -nolisten tcp "$@"
diff --git a/testing/xorg-xinit/xsession b/testing/xorg-xinit/xsession
deleted file mode 100644
index a16dc0b84..000000000
--- a/testing/xorg-xinit/xsession
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-#
-# ~/.xsession
-#
-# Executed by xdm/gdm/kdm at login
-#
-
-/bin/bash --login -i ~/.xinitrc
-
diff --git a/testing/yelp/PKGBUILD b/testing/yelp/PKGBUILD
deleted file mode 100644
index fd6da448a..000000000
--- a/testing/yelp/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 139079 2011-09-28 19:33:37Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=yelp
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="A help browser for GNOME"
-arch=('i686' 'x86_64')
-depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib'
-         'xz' 'bzip2' 'desktop-file-utils' 'dconf')
-makedepends=('intltool' 'gtk-doc')
-groups=('gnome')
-license=('GPL')
-options=('!emptydirs' '!libtool')
-url="http://www.gnome.org"
-install=yelp.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6c33bb608614cc81b1c6d9009621a0618beb39e75bf14da0f091871edcd03172')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/yelp/yelp.install b/testing/yelp/yelp.install
deleted file mode 100644
index f3bf19a93..000000000
--- a/testing/yelp/yelp.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall yelp
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/zenity/PKGBUILD b/testing/zenity/PKGBUILD
deleted file mode 100644
index 76cc8aada..000000000
--- a/testing/zenity/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 139083 2011-09-28 19:33:41Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=zenity
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="Display graphical dialog boxes from shell scripts"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gtk3' 'libnotify')
-makedepends=('intltool' 'gtk-doc')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e6a778db3655957770653745a2ecaef08a41a71f4a0a92cb7c5dc8ce0e9902d8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
author	Parabola <dev@list.parabolagnulinux.org>	2011-10-17 14:16:38 +0000
committer	Parabola <dev@list.parabolagnulinux.org>	2011-10-17 14:16:38 +0000
commit	e1b3d592f43a99f4ed7c91971deda6ce8414dd69 (patch)
tree	38fecdc19b201d4d28df13c22e9b3b45bb469e4b /testing
parent	d286d980d2ff42151e9bc81ec348c864c24f9cc4 (diff)